From b7a7fa64e420d16234df2ab811078f1681b449a8 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 1 Apr 2021 17:49:43 +0200
Subject: [PATCH] FIX #16800 TIME 0:15 add menu button
---
.../connection/connection.component.html | 1 +
.../connection/ldap/ldap-list.component.html | 1 +
.../connection/ldap/ldap.component.html | 1 +
.../administration/group/group.component.html | 12 +--
.../group/groups-list.component.html | 90 ++++++++++---------
.../history/history-list.component.html | 1 +
.../securities-administration.component.html | 1 +
.../sendmail/sendmail.component.html | 1 +
.../administration/user/user.component.html | 1 +
.../user/users-list.component.html | 90 ++++++++++---------
10 files changed, 102 insertions(+), 97 deletions(-)
diff --git a/src/frontend/app/administration/connection/connection.component.html b/src/frontend/app/administration/connection/connection.component.html
index bd9387f2c9..7e35cc0dd6 100644
--- a/src/frontend/app/administration/connection/connection.component.html
+++ b/src/frontend/app/administration/connection/connection.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{'lang.manage_connections' | translate}}</ion-title>
diff --git a/src/frontend/app/administration/connection/ldap/ldap-list.component.html b/src/frontend/app/administration/connection/ldap/ldap-list.component.html
index 384d396ba0..c9ae19490b 100644
--- a/src/frontend/app/administration/connection/ldap/ldap-list.component.html
+++ b/src/frontend/app/administration/connection/ldap/ldap-list.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{'lang.administration' | translate}} {{'lang.manage_ldap_configurationsAlt' | translate}}
diff --git a/src/frontend/app/administration/connection/ldap/ldap.component.html b/src/frontend/app/administration/connection/ldap/ldap.component.html
index 4778a5822b..17282d0858 100644
--- a/src/frontend/app/administration/connection/ldap/ldap.component.html
+++ b/src/frontend/app/administration/connection/ldap/ldap.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{title}}</ion-title>
diff --git a/src/frontend/app/administration/group/group.component.html b/src/frontend/app/administration/group/group.component.html
index b8179693af..e7cdaabf44 100644
--- a/src/frontend/app/administration/group/group.component.html
+++ b/src/frontend/app/administration/group/group.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{title}}</ion-title>
@@ -23,17 +24,6 @@
<ion-label (click)="togglePrivilege(privilege, false)">{{'lang.' + privilege.id + 'Admin' | translate}}</ion-label>
</ion-item>
</div>
- <!--<ion-grid *ngIf="!creationMode">
- <ion-row>
- <ion-col [size]="!signaturesService.mobileMode ? 2 : 2" *ngFor="let privilege of group.privileges">
- <ion-item style="cursor: pointer">
- <ion-toggle slot="start" [name]="privilege.id" color="primary" [checked]="privilege.checked"
- [(ngModel)]="privilege.checked" (click)="togglePrivilege(privilege, true)"></ion-toggle>
- <ion-label (click)="togglePrivilege(privilege, false)">{{'lang.' + privilege.id + 'Admin' | translate}}</ion-label>
- </ion-item>
- </ion-col>
- </ion-row>
- </ion-grid>-->
<ion-item lines="none" *ngIf="!creationMode">
<ion-label color="secondary">{{'lang.linkedUsers' | translate}} :</ion-label>
</ion-item>
diff --git a/src/frontend/app/administration/group/groups-list.component.html b/src/frontend/app/administration/group/groups-list.component.html
index cbfd736695..e0d57aa695 100644
--- a/src/frontend/app/administration/group/groups-list.component.html
+++ b/src/frontend/app/administration/group/groups-list.component.html
@@ -1,47 +1,51 @@
<ion-header [translucent]="true">
- <ion-toolbar color="primary">
- <ion-buttons slot="start">
- <ion-back-button></ion-back-button>
- </ion-buttons>
- <ion-title>{{'lang.administration' | translate}} {{'lang.manage_groupsAlt' | translate}}</ion-title>
- </ion-toolbar>
- <ion-toolbar color="primary">
- <ion-buttons slot="start">
- <ion-button fill="outline" shape="round" routerLink="/administration/groups/new">
- {{'lang.groupCreation' | translate}}
- </ion-button>
- </ion-buttons>
- <ion-title slot="end" color="secondary">{{groupList.length}} {{'lang.manage_groupsAlt' | translate}}</ion-title>
- </ion-toolbar>
+ <ion-toolbar color="primary">
+ <ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
+ <ion-back-button></ion-back-button>
+ </ion-buttons>
+ <ion-title>{{'lang.administration' | translate}} {{'lang.manage_groupsAlt' | translate}}</ion-title>
+ </ion-toolbar>
+ <ion-toolbar color="primary">
+ <ion-buttons slot="start">
+ <ion-button fill="outline" shape="round" routerLink="/administration/groups/new">
+ {{'lang.groupCreation' | translate}}
+ </ion-button>
+ </ion-buttons>
+ <ion-title slot="end" color="secondary">{{groupList.length}} {{'lang.manage_groupsAlt' | translate}}</ion-title>
+ </ion-toolbar>
</ion-header>
<ion-content #mainContent>
- <ion-list>
- <ion-item style="display: flex;">
- <ion-label color="primary" matSort [matSortActive]="displayedColumns[0]" matSortDirection='asc' style="display: flex;font-size: 12px;align-items: center;" (matSortChange)="sortData($event)">
- <ng-container *ngFor="let col of displayedColumns">
- <div [mat-sort-header]="col" disableClear style="flex: 1" *ngIf="col!=='actions'">
- {{'lang.' + col | translate}}
- </div>
- </ng-container>
- <div style="flex: 1" *ngIf="displayedColumns.indexOf('actions') > -1">
- <ion-searchbar [placeholder] = "'lang.filter' | translate" style="padding: 1px;" (ionChange)="applyFilter($event.detail.value)"></ion-searchbar>
- </div>
- </ion-label>
- <ion-button slot="end" fill="clear" shape="round" disabled>
- <ion-icon></ion-icon>
- </ion-button>
- </ion-item>
- <ion-virtual-scroll [items]="sortedData" approxItemHeight="50px">
- <ion-item *virtualItem="let element" style="display: flex;">
- <ion-label style="display: flex;cursor: pointer;" routerLink="/administration/groups/{{element.id}}">
- <div style="flex: 1" *ngFor="let col of displayedColumns">
- {{element[col]}}
- </div>
- </ion-label>
- <ion-button slot="end" fill="clear" shape="round" (click)="$event.stopPropagation();delete(element)" title="{{'lang.delete' | translate}}">
- <ion-icon color="danger" slot="icon-only" name="trash"></ion-icon>
- </ion-button>
- </ion-item>
- </ion-virtual-scroll>
- </ion-list>
+ <ion-list>
+ <ion-item style="display: flex;">
+ <ion-label color="primary" matSort [matSortActive]="displayedColumns[0]" matSortDirection='asc'
+ style="display: flex;font-size: 12px;align-items: center;" (matSortChange)="sortData($event)">
+ <ng-container *ngFor="let col of displayedColumns">
+ <div [mat-sort-header]="col" disableClear style="flex: 1" *ngIf="col!=='actions'">
+ {{'lang.' + col | translate}}
+ </div>
+ </ng-container>
+ <div style="flex: 1" *ngIf="displayedColumns.indexOf('actions') > -1">
+ <ion-searchbar [placeholder]="'lang.filter' | translate" style="padding: 1px;"
+ (ionChange)="applyFilter($event.detail.value)"></ion-searchbar>
+ </div>
+ </ion-label>
+ <ion-button slot="end" fill="clear" shape="round" disabled>
+ <ion-icon></ion-icon>
+ </ion-button>
+ </ion-item>
+ <ion-virtual-scroll [items]="sortedData" approxItemHeight="50px">
+ <ion-item *virtualItem="let element" style="display: flex;">
+ <ion-label style="display: flex;cursor: pointer;" routerLink="/administration/groups/{{element.id}}">
+ <div style="flex: 1" *ngFor="let col of displayedColumns">
+ {{element[col]}}
+ </div>
+ </ion-label>
+ <ion-button slot="end" fill="clear" shape="round" (click)="$event.stopPropagation();delete(element)"
+ title="{{'lang.delete' | translate}}">
+ <ion-icon color="danger" slot="icon-only" name="trash"></ion-icon>
+ </ion-button>
+ </ion-item>
+ </ion-virtual-scroll>
+ </ion-list>
</ion-content>
\ No newline at end of file
diff --git a/src/frontend/app/administration/history/history-list.component.html b/src/frontend/app/administration/history/history-list.component.html
index 08ca980acc..e48687a791 100644
--- a/src/frontend/app/administration/history/history-list.component.html
+++ b/src/frontend/app/administration/history/history-list.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{'lang.history' | translate}}</ion-title>
diff --git a/src/frontend/app/administration/security/securities-administration.component.html b/src/frontend/app/administration/security/securities-administration.component.html
index 27362b8574..bc25f495da 100644
--- a/src/frontend/app/administration/security/securities-administration.component.html
+++ b/src/frontend/app/administration/security/securities-administration.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{'lang.manage_password_rules' | translate}}</ion-title>
diff --git a/src/frontend/app/administration/sendmail/sendmail.component.html b/src/frontend/app/administration/sendmail/sendmail.component.html
index db473ab0db..23777ca722 100644
--- a/src/frontend/app/administration/sendmail/sendmail.component.html
+++ b/src/frontend/app/administration/sendmail/sendmail.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{title}}</ion-title>
diff --git a/src/frontend/app/administration/user/user.component.html b/src/frontend/app/administration/user/user.component.html
index fd02bc6b91..69ac193043 100644
--- a/src/frontend/app/administration/user/user.component.html
+++ b/src/frontend/app/administration/user/user.component.html
@@ -1,6 +1,7 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>{{title}}</ion-title>
diff --git a/src/frontend/app/administration/user/users-list.component.html b/src/frontend/app/administration/user/users-list.component.html
index 281d3f0c1c..1c386d1a43 100644
--- a/src/frontend/app/administration/user/users-list.component.html
+++ b/src/frontend/app/administration/user/users-list.component.html
@@ -1,47 +1,51 @@
<ion-header [translucent]="true">
- <ion-toolbar color="primary">
- <ion-buttons slot="start">
- <ion-back-button></ion-back-button>
- </ion-buttons>
- <ion-title>{{'lang.administration' | translate}} {{'lang.manage_usersAlt' | translate}}</ion-title>
- </ion-toolbar>
- <ion-toolbar color="primary">
- <ion-buttons slot="start">
- <ion-button fill="outline" shape="round" routerLink="/administration/users/new">
- {{'lang.userCreation' | translate}}
- </ion-button>
- </ion-buttons>
- <ion-title slot="end" color="secondary">{{userList.length}} {{'lang.manage_usersAlt' | translate}}</ion-title>
- </ion-toolbar>
+ <ion-toolbar color="primary">
+ <ion-buttons slot="start">
+ <ion-menu-button menu="left-menu"></ion-menu-button>
+ <ion-back-button></ion-back-button>
+ </ion-buttons>
+ <ion-title>{{'lang.administration' | translate}} {{'lang.manage_usersAlt' | translate}}</ion-title>
+ </ion-toolbar>
+ <ion-toolbar color="primary">
+ <ion-buttons slot="start">
+ <ion-button fill="outline" shape="round" routerLink="/administration/users/new">
+ {{'lang.userCreation' | translate}}
+ </ion-button>
+ </ion-buttons>
+ <ion-title slot="end" color="secondary">{{userList.length}} {{'lang.manage_usersAlt' | translate}}</ion-title>
+ </ion-toolbar>
</ion-header>
<ion-content #mainContent>
- <ion-list>
- <ion-item style="display: flex;">
- <ion-label color="primary" matSort [matSortActive]="displayedColumns[1]" matSortDirection='asc' style="display: flex;font-size: 12px;align-items: center;" (matSortChange)="sortData($event)">
- <ng-container *ngFor="let col of displayedColumns">
- <div [mat-sort-header]="col" disableClear style="flex: 1" *ngIf="col!=='actions'">
- {{'lang.' + col | translate}}
- </div>
- </ng-container>
- <div style="flex: 1" *ngIf="displayedColumns.indexOf('actions') > -1">
- <ion-searchbar [placeholder] = "'lang.filter' | translate" style="padding: 1px;" (ionChange)="applyFilter($event.detail.value)"></ion-searchbar>
- </div>
- </ion-label>
- <ion-button slot="end" fill="clear" shape="round" disabled>
- <ion-icon></ion-icon>
- </ion-button>
- </ion-item>
- <ion-virtual-scroll [items]="sortedData" approxItemHeight="50px">
- <ion-item *virtualItem="let element" style="display: flex;">
- <ion-label style="display: flex;cursor: pointer;" routerLink="/administration/users/{{element.id}}">
- <div style="flex: 1" *ngFor="let col of displayedColumns">
- {{element[col]}}
- </div>
- </ion-label>
- <ion-button slot="end" fill="clear" shape="round" [disabled]="element.id === authService.user.id" (click)="$event.stopPropagation();delete(element)" title="{{'lang.delete' | translate}}">
- <ion-icon color="danger" slot="icon-only" name="trash"></ion-icon>
- </ion-button>
- </ion-item>
- </ion-virtual-scroll>
- </ion-list>
+ <ion-list>
+ <ion-item style="display: flex;">
+ <ion-label color="primary" matSort [matSortActive]="displayedColumns[1]" matSortDirection='asc'
+ style="display: flex;font-size: 12px;align-items: center;" (matSortChange)="sortData($event)">
+ <ng-container *ngFor="let col of displayedColumns">
+ <div [mat-sort-header]="col" disableClear style="flex: 1" *ngIf="col!=='actions'">
+ {{'lang.' + col | translate}}
+ </div>
+ </ng-container>
+ <div style="flex: 1" *ngIf="displayedColumns.indexOf('actions') > -1">
+ <ion-searchbar [placeholder]="'lang.filter' | translate" style="padding: 1px;"
+ (ionChange)="applyFilter($event.detail.value)"></ion-searchbar>
+ </div>
+ </ion-label>
+ <ion-button slot="end" fill="clear" shape="round" disabled>
+ <ion-icon></ion-icon>
+ </ion-button>
+ </ion-item>
+ <ion-virtual-scroll [items]="sortedData" approxItemHeight="50px">
+ <ion-item *virtualItem="let element" style="display: flex;">
+ <ion-label style="display: flex;cursor: pointer;" routerLink="/administration/users/{{element.id}}">
+ <div style="flex: 1" *ngFor="let col of displayedColumns">
+ {{element[col]}}
+ </div>
+ </ion-label>
+ <ion-button slot="end" fill="clear" shape="round" [disabled]="element.id === authService.user.id"
+ (click)="$event.stopPropagation();delete(element)" title="{{'lang.delete' | translate}}">
+ <ion-icon color="danger" slot="icon-only" name="trash"></ion-icon>
+ </ion-button>
+ </ion-item>
+ </ion-virtual-scroll>
+ </ion-list>
</ion-content>
\ No newline at end of file
--
GitLab