Verified Commit 4c517c27 authored by Alex ORLUC's avatar Alex ORLUC

FEAT #11641 #11643 TIME 3 fix remove folder + fix panel css folder + fix css folder info

parent 882caf60
...@@ -24,27 +24,19 @@ ...@@ -24,27 +24,19 @@
</div> </div>
</div> </div>
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()" style="padding-bottom: 20px;"> <div class="bg-head-content" [class.fullContainer]="appService.getViewMode()" style="padding-bottom: 20px;">
<app-filters-tool style="flex:1;overflow-x: auto;overflow-y: hidden;" #filtersTool <div [class.banner-opened]="folderInfoOpened" [class.banner-closed]="!folderInfoOpened">
[listProperties]="this.listProperties" [snavR]="snav2" [totalRes]="allResInBasket.length" <div class="title" style="cursor:pointer;" (click)="folderInfoOpened = !folderInfoOpened">
[selectedRes]="selectedRes" [routeDatas]="'/rest/folders/' + folderInfo.id + '/filters'" <i class="far" [class.fa-plus-square]="!folderInfoOpened" [class.fa-minus-square]="folderInfoOpened" style="cursor:pointer;margin-left: 10px;" (click)="folderInfoOpened = !folderInfoOpened"></i>&nbsp;{{lang.informations}} du dossier
(toggleAllRes)="toggleAllRes($event)" (refreshEventAfterAction)="refreshDaoAfterAction()" <div *ngIf="folderInfoOpened" class="title-divider"></div>
(refreshEvent)="refreshDao()" [title]="lang.searchMailInFolder">
</app-filters-tool>
</div>
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()">
<div class="banner">
<div class="banner-title">
{{lang.informations}} du dossier
<div class="banner-title-divider"></div>
</div> </div>
<div class="banner-content"> <div *ngIf="folderInfoOpened" class="content">
<div class="banner-content-item"> <div class="content-item">
Propriétaire :<br /><b>{{folderInfo.ownerDisplayName}}</b> Propriétaire :<br /><b>{{folderInfo.ownerDisplayName}}</b>
</div> </div>
<div *ngIf="folderInfo.entitiesSharing.length === 0" class="banner-content-item private"> <div *ngIf="folderInfo.entitiesSharing.length === 0" class="content-item private">
Dossier privé Dossier privé
</div> </div>
<div *ngIf="folderInfo.entitiesSharing.length > 0" class="banner-content-item"> <div *ngIf="folderInfo.entitiesSharing.length > 0" class="content-item">
Visible par :<br /> Visible par :<br />
<div style="max-height: 100px;overflow: auto;"> <div style="max-height: 100px;overflow: auto;">
<div *ngFor="let entity of folderInfo.entitiesSharing | sortBy"> <div *ngFor="let entity of folderInfo.entitiesSharing | sortBy">
...@@ -55,6 +47,14 @@ ...@@ -55,6 +47,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bg-head-content" [class.fullContainer]="appService.getViewMode()">
<app-filters-tool style="flex:1;overflow-x: auto;overflow-y: hidden;" #filtersTool
[listProperties]="this.listProperties" [snavR]="snav2" [totalRes]="allResInBasket.length"
[selectedRes]="selectedRes" [routeDatas]="'/rest/folders/' + folderInfo.id + '/filters'"
(toggleAllRes)="toggleAllRes($event)" (refreshEventAfterAction)="refreshDaoAfterAction()"
(refreshEvent)="refreshDao()" [title]="lang.searchMailInFolder">
</app-filters-tool>
</div>
</div> </div>
<div class="container" [class.fullContainer]="appService.getViewMode()"> <div class="container" [class.fullContainer]="appService.getViewMode()">
<div class="container-content"> <div class="container-content">
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
color: $primary; color: $primary;
} }
.banner { .banner-opened {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 10px; margin: 10px;
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
background: lighten($primary, 10%); background: lighten($primary, 10%);
width: 100%; width: 100%;
&-title { .title {
white-space: pre; white-space: pre;
overflow: hidden; overflow: hidden;
max-width: 85%; max-width: 85%;
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
} }
} }
&-content { .content {
display: flex; display: flex;
font-size: 16px; font-size: 16px;
...@@ -63,4 +63,29 @@ ...@@ -63,4 +63,29 @@
align-items: center; align-items: center;
} }
} }
}
.banner-closed {
display: flex;
flex-direction: column;
margin: 10px;
position: relative;
width: 100%;
.title {
white-space: pre;
overflow: hidden;
max-width: 85%;
text-overflow: ellipsis;
z-index: 1;
font-size: 20px;
font-weight: bold;
letter-spacing: 2px;
position: absolute;
top: -18px;
left: 20px;
padding: 0px;
margin: 0px;
color: white;
}
} }
\ No newline at end of file
...@@ -21,6 +21,7 @@ import { BasketHomeComponent } from '../../basket/basket-home.component'; ...@@ -21,6 +21,7 @@ import { BasketHomeComponent } from '../../basket/basket-home.component';
import { ConfirmComponent } from '../../../plugins/modal/confirm.component'; import { ConfirmComponent } from '../../../plugins/modal/confirm.component';
import { FolderActionListComponent } from '../folder-action-list/folder-action-list.component'; import { FolderActionListComponent } from '../folder-action-list/folder-action-list.component';
import { FiltersListService } from '../../../service/filtersList.service'; import { FiltersListService } from '../../../service/filtersList.service';
import { trigger, transition, style, animate } from '@angular/animations';
declare function $j(selector: any): any; declare function $j(selector: any): any;
...@@ -28,7 +29,7 @@ declare function $j(selector: any): any; ...@@ -28,7 +29,7 @@ declare function $j(selector: any): any;
@Component({ @Component({
templateUrl: "folder-document-list.component.html", templateUrl: "folder-document-list.component.html",
styleUrls: ['folder-document-list.component.scss'], styleUrls: ['folder-document-list.component.scss'],
providers: [NotificationService, AppService], providers: [NotificationService, AppService]
}) })
export class FolderDocumentListComponent implements OnInit { export class FolderDocumentListComponent implements OnInit {
...@@ -89,6 +90,7 @@ export class FolderDocumentListComponent implements OnInit { ...@@ -89,6 +90,7 @@ export class FolderDocumentListComponent implements OnInit {
'ownerDisplayName': '', 'ownerDisplayName': '',
'entitiesSharing': [] 'entitiesSharing': []
}; };
folderInfoOpened: boolean = false;
private destroy$ = new Subject<boolean>(); private destroy$ = new Subject<boolean>();
...@@ -129,6 +131,7 @@ export class FolderDocumentListComponent implements OnInit { ...@@ -129,6 +131,7 @@ export class FolderDocumentListComponent implements OnInit {
this.isLoadingResults = false; this.isLoadingResults = false;
this.route.params.subscribe(params => { this.route.params.subscribe(params => {
this.folderInfoOpened = false;
this.dragInit = true; this.dragInit = true;
this.destroy$.next(true); this.destroy$.next(true);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
(triggerEvent)="goTo($event)"></plugin-autocomplete> (triggerEvent)="goTo($event)"></plugin-autocomplete>
</div> </div>
<div> <div>
<button mat-icon-button color="accent" title="{{lang.addRootFolder}}" (click)="toggleInput()"> <button mat-icon-button color="primary" title="{{lang.addRootFolder}}" (click)="toggleInput()">
<mat-icon class="fa fa-plus"></mat-icon> <mat-icon class="fa fa-plus"></mat-icon>
</button> </button>
</div> </div>
......
...@@ -117,6 +117,7 @@ button:disabled { ...@@ -117,6 +117,7 @@ button:disabled {
color: rgb(102, 102, 102); color: rgb(102, 102, 102);
} }
.folderTools { .folderTools {
padding-right: 15px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: baseline; align-items: baseline;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment