diff --git a/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html b/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html index 7d5b1c352fd0e41c73e498e368cb8bbae024ca61..0e6c26eba082d6fef55b9a08e15f0c729d7022df 100644 --- a/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html +++ b/src/frontend/app/administration/contact/customField/contacts-custom-fields-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -104,7 +104,7 @@ </div> </mat-sidenav-content> <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end' opened class="col-md-4 col-sm-12 customFielsdPanel"> + position='end' opened class="col-md-4 col-sm-12 customFielsdPanel"> <mat-tab-group> <mat-tab [label]="lang.customFieldsTypesAvailable"> <div class="customFieldsTypesItem" *ngFor="let customField of customFieldsTypes"> diff --git a/src/frontend/app/administration/contact/group/contacts-group-administration.component.html b/src/frontend/app/administration/contact/group/contacts-group-administration.component.html index 19f3bb006410ce640898cd84b1d62cb3b8ed808e..08d0b74a327e8a846af66c4d5b72a75df442a9ab 100644 --- a/src/frontend/app/administration/contact/group/contacts-group-administration.component.html +++ b/src/frontend/app/administration/contact/group/contacts-group-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -135,7 +135,7 @@ </div> </mat-sidenav-content> <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end' [opened]="appService.getViewMode() || creationMode ? false : true" style="overflow-x:hidden;width:40%;"> + position='end' [opened]="appService.getViewMode() || creationMode ? false : true" style="overflow-x:hidden;width:40%;"> <mat-list> <h3 mat-subheader>{{nbContact}} {{lang.relatedContacts}} : </h3> </mat-list> diff --git a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html index 81e1d2d0326e7e4f6d8b965305b1618b3d3a9337..c994ed6e01a1de971d11c22114ec6c504ce6a755 100644 --- a/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html +++ b/src/frontend/app/administration/contact/group/contacts-groups-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -115,6 +115,6 @@ </div> </mat-sidenav-content> <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end'> + position='end'> </mat-sidenav> </mat-sidenav-container> \ No newline at end of file diff --git a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html index 9ecb707d2e5d8bc52a21e7fe0628dedfa0b744f4..473f458553b89dc790b77b24dfedef7a7020ba6d 100644 --- a/src/frontend/app/administration/contact/list/contacts-list-administration.component.html +++ b/src/frontend/app/administration/contact/list/contacts-list-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -66,22 +66,19 @@ </mat-cell> </ng-container> <ng-container matColumnDef="firstname"> - <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.firstname}}</mat-header-cell> - <mat-cell mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.firstname}}</mat-header-cell> + <mat-cell mat-cell *matCellDef="let element"> {{element.firstname}} </mat-cell> </ng-container> <ng-container matColumnDef="lastname"> - <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.lastname}}</mat-header-cell> - <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.lastname}}</mat-header-cell> + <mat-cell *matCellDef="let element"> {{element.lastname}} </mat-cell> </ng-container> <ng-container matColumnDef="company"> - <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.contactsParameters_company}} + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.contactsParameters_company}} </mat-header-cell> - <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"> + <mat-cell *matCellDef="let element"> {{element.company}} </mat-cell> </ng-container> <ng-container matColumnDef="formatedAddress"> @@ -123,7 +120,4 @@ </div> </div> </mat-sidenav-content> - <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end' [opened]="appService.getViewMode() ? false : false"> - </mat-sidenav> </mat-sidenav-container> \ No newline at end of file diff --git a/src/frontend/app/administration/contact/page/contacts-page-administration.component.html b/src/frontend/app/administration/contact/page/contacts-page-administration.component.html index 1e69337cc666b033c70e0ee9307f549d479e9bd7..5b503e599bc53b4a983519aa4be7d321b3ed738f 100644 --- a/src/frontend/app/administration/contact/page/contacts-page-administration.component.html +++ b/src/frontend/app/administration/contact/page/contacts-page-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -32,7 +32,4 @@ </div> </div> </mat-sidenav-content> - <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end' [opened]="appService.getViewMode() ? false : false"> - </mat-sidenav> </mat-sidenav-container> \ No newline at end of file diff --git a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html index 02fa2b36dde718a938ab1545d2f045b2fa452262..ef6514056a7e60793c86521cbe6105de7e30a2eb 100644 --- a/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html +++ b/src/frontend/app/administration/contact/parameter/contacts-parameters-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -156,7 +156,4 @@ </div> </div> </mat-sidenav-content> - <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end'> - </mat-sidenav> </mat-sidenav-container> \ No newline at end of file diff --git a/src/frontend/app/administration/history/history-administration.component.html b/src/frontend/app/administration/history/history-administration.component.html index 04e33eb5ac9b33bd2b91a1602a621d8d34825064..c925ddd0b7a262e93080cad12d51a511980103e8 100755 --- a/src/frontend/app/administration/history/history-administration.component.html +++ b/src/frontend/app/administration/history/history-administration.component.html @@ -1,6 +1,6 @@ <mat-sidenav-container autosize class="maarch-container"> <mat-sidenav #snav [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" [opened]="appService.getViewMode() ? false : true"> + [opened]="appService.getViewMode() ? false : true"> <header-panel [snavLeft]="snav"></header-panel> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> @@ -115,32 +115,29 @@ <mat-table id="history-list" #tableHistoryListSort="matSort" [dataSource]="data" matSort matSortActive="event_date" matSortDirection="desc" style="width:100%;"> <ng-container matColumnDef="event_date"> - <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.event}}</mat-header-cell> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.event}}</mat-header-cell> <mat-cell mat-cell *matCellDef="let element" - [class.hide-for-mobile]="appService.getViewMode()" [title]="element.event_date | fullDate"> {{element.event_date | timeAgo : 'full' | ucfirst}} </mat-cell> </ng-container> <ng-container matColumnDef="userLabel"> - <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.user | ucfirst}}</mat-header-cell> - <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"> + <mat-header-cell *matHeaderCellDef mat-sort-header>{{lang.user | ucfirst}}</mat-header-cell> + <mat-cell *matCellDef="let element"> {{element.userLabel}} </mat-cell> </ng-container> <ng-container matColumnDef="info"> <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()" style="flex: 2;">{{lang.information}} + style="flex: 2;">{{lang.information}} </mat-header-cell> - <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()" + <mat-cell *matCellDef="let element" style="flex: 2;"> {{element.info}} </mat-cell> </ng-container> <ng-container matColumnDef="remote_ip"> <mat-header-cell *matHeaderCellDef mat-sort-header - [class.hide-for-mobile]="appService.getViewMode()">{{lang.ip}} + >{{lang.ip}} </mat-header-cell> - <mat-cell *matCellDef="let element" [class.hide-for-mobile]="appService.getViewMode()"> + <mat-cell *matCellDef="let element"> {{element.remote_ip}} </mat-cell> </ng-container> <mat-header-row *matHeaderRowDef="displayedColumnsHistory"></mat-header-row> @@ -156,7 +153,4 @@ </div> </div> </mat-sidenav-content> - <mat-sidenav #snav2 [mode]="appService.getViewMode() ? 'over' : 'side'" [fixedInViewport]="appService.getViewMode()" - fixedTopGap="56" position='end' [opened]="appService.getViewMode() ? false : false"> - </mat-sidenav> </mat-sidenav-container> \ No newline at end of file diff --git a/src/frontend/app/administration/home/administration.component.html b/src/frontend/app/administration/home/administration.component.html index a37c47a9ab02caef7778a77fbcf1033bd3a027bf..7fa9df6d118afee825de57797536e1642eee6c45 100644 --- a/src/frontend/app/administration/home/administration.component.html +++ b/src/frontend/app/administration/home/administration.component.html @@ -26,7 +26,7 @@ <mat-spinner style="margin:auto;"></mat-spinner> </div> <div *ngIf="!loading" class="row adminArea"> - <div class="col-md-6 adminArea_1" *ngIf="organisationServices"> + <div class="col-md-6 col-sm-12 col-xs-12 adminArea_1" *ngIf="organisationServices"> <div class="adminArea-label">{{lang.organization}}</div> <button class="col-md-4 col-xs-6 adminArea-button" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of organisationServices | sortBy : 'label'" @@ -35,7 +35,7 @@ <br />{{modService.label}}</button> </div> - <div class="col-md-6 adminArea_2" *ngIf="productionServices"> + <div class="col-md-6 col-sm-12 col-xs-12 adminArea_2" *ngIf="productionServices"> <div class="adminArea-label">{{lang.production}}</div> <button class="col-md-4 col-xs-6 adminArea-button" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of productionServices | sortBy : 'label'" @@ -43,7 +43,7 @@ <i class="{{modService.style}} fa-4x"></i> <br />{{modService.label}}</button> </div> - <div class="col-md-6 adminArea_3" *ngIf="classementServices"> + <div class="col-md-6 col-sm-12 col-xs-12 adminArea_3" *ngIf="classementServices"> <div class="adminArea-label">{{lang.classifying}}</div> <button class="col-md-4 col-xs-6 adminArea-button" mat-button color="primary" matTooltip="{{modService.comment}}" *ngFor="let modService of classementServices | sortBy : 'label'" @@ -51,7 +51,7 @@ <i class="{{modService.style}} fa-4x"></i> <br />{{modService.label}}</button> </div> - <div class="col-md-6 adminArea_4" *ngIf="supervisionServices"> + <div class="col-md-6 col-sm-12 col-xs-12 adminArea_4" *ngIf="supervisionServices"> <div class="adminArea-label">{{lang.supervision}}</div> <ng-container> <button class="col-md-4 col-xs-6 adminArea-button" diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.html b/src/frontend/app/folder/document-list/folder-document-list.component.html index 5514a09d88af49da3c365c469d4983557358df6f..481c1d5294da7e2e6698e664f2be6ba9ed702a72 100644 --- a/src/frontend/app/folder/document-list/folder-document-list.component.html +++ b/src/frontend/app/folder/document-list/folder-document-list.component.html @@ -72,11 +72,11 @@ {{lang.selected}}</small> </div> <div class="table-head-tool"> - <span style="float:right;height: 56px;margin-top: 5px;"> + <span> <mat-paginator #paginatorResultList [length]="resultsLength" [pageSizeOptions]="[10, 25, 50, 100, 150]" class="paginatorResultList"></mat-paginator> </span> - <span style="float:right;height: 56px;margin-top: 11px;"> + <span> <app-folder-action-list #actionsList [contextMode]="false" [currentFolderInfo]="folderInfo" [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" (refreshEvent)="refreshDaoAfterAction()" @@ -195,7 +195,7 @@ <div *ngIf="innerHtml" [matTooltip]="currentChrono" [innerHTML]="innerHtml" style="height: 100%;overflow: hidden;"></div> - <div style="display:flex;"> + <div style="display:flex;position: sticky;top: 0px;z-index: 2;"> <button mat-icon-button (click)="snav2.close()" style="font-size: 20px;color:#666;"> <mat-icon class="fa fa-arrow-right"></mat-icon> </button> diff --git a/src/frontend/app/home/followed-list/followed-document-list.component.html b/src/frontend/app/home/followed-list/followed-document-list.component.html index f48fd2a4f04569c4e8d3a3834fd4fa772a2de369..147df8f3ed198c02fe92a0af4cb9d4b2291ed5c0 100644 --- a/src/frontend/app/home/followed-list/followed-document-list.component.html +++ b/src/frontend/app/home/followed-list/followed-document-list.component.html @@ -48,11 +48,11 @@ {{lang.selected}}</small> </div> <div class="table-head-tool"> - <span style="float:right;height: 56px;margin-top: 5px;"> + <span> <mat-paginator #paginatorResultList [length]="resultsLength" [pageSizeOptions]="[10, 25, 50, 100, 150]" class="paginatorResultList"></mat-paginator> </span> - <span style="float:right;height: 56px;margin-top: 11px;"> + <span> <app-followed-action-list #actionsList [contextMode]="false" [currentFolderInfo]="folderInfo" [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [menuShortcut]="menuShortcut" (refreshEvent)="refreshDaoAfterAction()"> @@ -170,7 +170,7 @@ <div *ngIf="innerHtml" [matTooltip]="currentChrono" [innerHTML]="innerHtml" style="height: 100%;overflow: hidden;"></div> - <div style="display:flex;"> + <div style="display:flex;position: sticky;top: 0px;z-index: 2;"> <button mat-icon-button (click)="snav2.close()" style="font-size: 20px;color:#666;"> <mat-icon class="fa fa-arrow-right"></mat-icon> </button> diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html index 76a78c37eed40408fa4e71fdfda7a9a63a199821..d5eb5f9f12087d26f0876dda92c22aeec4cfa960 100644 --- a/src/frontend/app/list/basket-list.component.html +++ b/src/frontend/app/list/basket-list.component.html @@ -46,15 +46,15 @@ {{lang.selected}}</small> </div> <div class="table-head-tool"> - <span style="float:right;height: 56px;margin-top: 5px;"> + <span> <mat-paginator #paginatorResultList [length]="resultsLength" [pageSizeOptions]="[10, 25, 50, 100, 150]" class="paginatorResultList"></mat-paginator> </span> - <span style="float:right;height: 56px;margin-top: 11px;"> + <span> <app-tools-list #actionsList [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo"></app-tools-list> </span> - <span style="float:right;height: 56px;margin-top: 11px;"> + <span> <app-actions-list #actionsList (refreshEvent)="refreshDao()" [contextMode]="false" [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo" [currentResource]="currentResource" (refreshPanelFolders)="panelFolder.refreshFoldersTree()"></app-actions-list> @@ -199,8 +199,8 @@ <div *ngIf="innerHtml && !filtersListService.filterMode" [matTooltip]="currentChrono" [innerHTML]="innerHtml" style="height: 100%;overflow: hidden;"></div> - <div style="display:flex;"> - <button mat-icon-button (click)="snav2.close()" style="font-size: 20px;color:#666;"> + <div style="display:flex;position: sticky;top: 0px;z-index: 2;"> + <button mat-icon-button (click)="snav2.close()" style="font-size: 20px;color:#666;"> <mat-icon class="fa fa-arrow-right"></mat-icon> </button> </div> diff --git a/src/frontend/app/list/panel/panel-list.component.html b/src/frontend/app/list/panel/panel-list.component.html index 54517a60a43dcc4f56528ee0eb8aaeda20675a72..afb3f529c3b552ac2b015e35edfa11171b71449c 100644 --- a/src/frontend/app/list/panel/panel-list.component.html +++ b/src/frontend/app/list/panel/panel-list.component.html @@ -1,7 +1,7 @@ <div style="font-size: 60px;opacity: 0.1;padding-bottom: 30px;text-align: center;"> <mat-icon fontSet="fas" fontIcon="{{icon}} fa-2x"></mat-icon> </div> -<div style="display:flex;justify-content: center;align-items: center;color: #666;padding-bottom: 10px;"> +<div style="position: sticky;top: 0px;background:white;z-index: 1;display:flex;justify-content: center;align-items: center;color: #666;padding: 10px;"> <mat-icon *ngIf="this.currentResource.statusImage !== undefined" [ngStyle]="{'color': this.currentResource.priorityColor}" color="primary" class="{{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}} {{this.currentResource.statusImage}} {{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}}-2x"> diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html index c6adb1efe15c3bba556f11a22b0797691b75e331..91c824c2083bee28ae6b3062388208159a43f29c 100644 --- a/src/frontend/app/process/process.component.html +++ b/src/frontend/app/process/process.component.html @@ -12,7 +12,7 @@ (click)="changeTab(module.id)"> <i *ngIf="module.count > 0" class="fas fa-circle haveContent"></i> <i [class]="module.icon"></i> - <span *ngIf="!appService.getViewMode()">{{module.label}}</span> + <span>{{module.label}}</span> </div> </div> </div> diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts index f6d81b3f386c610dc69eceb1c889ef8222fa6f8f..5ef4c40a4693685f074092a1ad88d34e017129ff 100755 --- a/src/frontend/app/process/process.component.ts +++ b/src/frontend/app/process/process.component.ts @@ -190,6 +190,12 @@ export class ProcessComponent implements OnInit { this.loadBadges(); this.loadResource(); + if (this.appService.getViewMode()) { + setTimeout(() => { + this.sidenavLeft.open(); + }, 800); + } + this.http.get(`../../rest/resources/${this.currentResourceInformations.resId}/users/${this.currentUserId}/groups/${this.currentGroupId}/baskets/${this.currentBasketId}/processingData`).pipe( tap((data: any) => { if (data.listEventData !== null) { diff --git a/src/frontend/css/engine_2.scss b/src/frontend/css/engine_2.scss index 82055653c526c0990f22af376b3dbd2f1050a15f..b1b642390ffb01d66bc7a51406345eb7f1364556 100644 --- a/src/frontend/css/engine_2.scss +++ b/src/frontend/css/engine_2.scss @@ -96,6 +96,7 @@ html,body { .table-head { overflow: auto; + overflow-y: hidden; display: flex; padding-left: 25px; padding-right: 25px; @@ -125,8 +126,9 @@ html,body { } &-tool { - justify-content: flex-end; - + justify-content: flex-start; + display: flex; + flex-direction: row-reverse; span { padding-left: 5px; padding-right: 5px; @@ -134,6 +136,11 @@ html,body { } } +.mat-paginator { + .mat-paginator-container { + flex-wrap: initial !important; + } +} .mat-icon { height: auto; }