From 6c0930b346d6b0fdc5b776409b0a9adc93cb0a17 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 11 Mar 2020 15:08:01 +0100
Subject: [PATCH] FEAT #13480 TIME 0:15 add boundary dnd
---
.../app/process/process.component.html | 20 +++++++++----------
src/frontend/service/app.guard.ts | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html
index 403f6ddd41b..f841dceef2d 100644
--- a/src/frontend/app/process/process.component.html
+++ b/src/frontend/app/process/process.component.html
@@ -159,7 +159,7 @@
<div class="emptyAction" *ngIf="actionsList.length === 0" [innerHTML]="lang.noAvailableActionProcess"></div>
</div>
</ng-template>
- <mat-sidenav-content>
+ <mat-sidenav-content class="process-content">
<div class="bg-head">
<div class="bg-head-title" [class.customContainerRight]="appService.getViewMode()">
<div class="bg-head-title-label">
@@ -249,15 +249,8 @@
</app-document-viewer>
</div>
</div>
- </mat-sidenav-content>
- <mat-sidenav #snav2 [fixedInViewport]="appService.getViewMode()" position='end'
- [opened]="appService.getViewMode() ? false : false" [mode]="appService.getViewMode() ? 'over' : 'side'"
- class="panel-right" style="overflow-x:hidden;" [class.docView]="!filtersListService.filterMode"
- [ngStyle]="{'width': appService.getViewMode() ? '80%' : '30%'}" autoFocus="false">
- </mat-sidenav>
-</mat-sidenav-container>
-<div class="modal-module {{modal.id}}" cdkDrag *ngFor="let modal of modalModule; let i=index"
- [class.largeModal]="modal.id === 'info'">
+ <div class="modal-module {{modal.id}}" cdkDrag *ngFor="let modal of modalModule; let i=index"
+ [class.largeModal]="modal.id === 'info'" cdkDragBoundary=".process-content">
<div class="modal-module-title" cdkDragHandle>
<span>
{{modal.label}}
@@ -317,3 +310,10 @@
</div>
</div>
</div>
+ </mat-sidenav-content>
+ <mat-sidenav #snav2 [fixedInViewport]="appService.getViewMode()" position='end'
+ [opened]="appService.getViewMode() ? false : false" [mode]="appService.getViewMode() ? 'over' : 'side'"
+ class="panel-right" style="overflow-x:hidden;" [class.docView]="!filtersListService.filterMode"
+ [ngStyle]="{'width': appService.getViewMode() ? '80%' : '30%'}" autoFocus="false">
+ </mat-sidenav>
+</mat-sidenav-container>
\ No newline at end of file
diff --git a/src/frontend/service/app.guard.ts b/src/frontend/service/app.guard.ts
index e8c76080b8f..7147a1b2a0a 100644
--- a/src/frontend/service/app.guard.ts
+++ b/src/frontend/service/app.guard.ts
@@ -27,7 +27,7 @@ export class AppGuard implements CanActivate {
} else {
this.headerService.hideSideBar = false;
}
- if (route.url.filter((url: any) => url == 'administration').length > 0) {
+ if (route.url.filter((url: any) => url == 'administration').length > 0 || route.url.filter((url: any) => url == 'profile').length > 0) {
this.headerService.sideBarAdmin = true;
} else {
this.headerService.sideBarAdmin = false;
--
GitLab