diff --git a/src/frontend/app/actions/actions-list.component.html b/src/frontend/app/actions/actions-list.component.html index 52d7eb2ade64366622806c39a51502986c0cd6f6..66ab45424e2020edd28dbe21f90be3a276e97bbc 100755 --- a/src/frontend/app/actions/actions-list.component.html +++ b/src/frontend/app/actions/actions-list.component.html @@ -22,39 +22,39 @@ <folder-menu [resIds]="selectedRes" [currentFolders]="folderList" (refreshList)="refreshList()" (refreshFolders)="refreshFolders()"></folder-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('freeze_retention_rule')" mat-menu-item [matMenuTriggerFor]="freezeRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.freezeRetentionRule')"> - <mat-icon class="freezeIcon fas fa-snowflake fa-2x" style="font-size: 20px;"></mat-icon> + [title]="'lang.freezeRetentionRule' | translate "> + <mat-icon class="freezeIcon fas fa-snowflake" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.freezeRetentionRule' | translate }}</span> </button> - <mat-menu #freezeRentalRule = "matMenu"> - <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > + <mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)"> + <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" + [title]="'lang.freezeTheCurrentUsefulLife' | translate " > {{ 'lang.freezeTheCurrentUsefulLife' | translate }} </button> <mat-divider></mat-divider> <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > + [title]="'lang.thawTheCurrentUsefulLife' | translate" > {{ 'lang.thawTheCurrentUsefulLife' | translate }} </button> </mat-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('set_binding_document')" mat-menu-item [matMenuTriggerFor]="bindingRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.setBindingDocument')"> - <mat-icon class="bindidngIcon fas fa-exclamation fa-2x" style="font-size: 20px;"></mat-icon> + [title]="'lang.setBindingDocument' | translate "> + <mat-icon class="bindidngIcon fas fa-exclamation" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.setBindingDocument' | translate }}</span> </button> <mat-menu #bindingRentalRule="matMenu"> <buton mat-menu-item (click)="toogleBinding(true)" class="{{this.isSelectedBinding === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.bindingMail')"> + [title]="'lang.bindingMail' | translate"> {{ 'lang.bindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(false)" class="{{this.isSelectedBinding === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.noBindingMal')"> - {{ 'lang.noBindingMal' | translate}}</buton> + [title]="'lang.noBindingMail' | translate"> + {{ 'lang.noBindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(null)" class="{{this.isSelectedBinding === null ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.doNotDEfine')"> - {{ 'lang.doNotDEfine' | translate}}</buton> + [title]="'lang.doNotDefine' | translate"> + {{ 'lang.doNotDefine' | translate}}</buton> <mat-divider></mat-divider> </mat-menu> </mat-menu> diff --git a/src/frontend/app/actions/actions-list.component.scss b/src/frontend/app/actions/actions-list.component.scss index 50d00becd417781ee93151da534f2a01aab9caf8..e4dfb4cd4fb776533f64301b183c5c5c55c2832e 100644 --- a/src/frontend/app/actions/actions-list.component.scss +++ b/src/frontend/app/actions/actions-list.component.scss @@ -34,7 +34,7 @@ } .isSelectedMenu { - background: rgba(249, 152, 48, 0.14); + background: $secondary; } .notSelectedMenu { diff --git a/src/frontend/app/actions/actions-list.component.ts b/src/frontend/app/actions/actions-list.component.ts index a263115812af68ca62a31d34a05c721abb69ffaa..c8bfb2fa1e23302c047815a8649d3dc85153ced5 100644 --- a/src/frontend/app/actions/actions-list.component.ts +++ b/src/frontend/app/actions/actions-list.component.ts @@ -179,7 +179,7 @@ export class ActionsListComponent implements OnInit { if (value) { this.notify.success(this.translate.instant('lang.bindingMail')); } else if (value === false) { - this.notify.success(this.translate.instant('lang.noBindingMal')); + this.notify.success(this.translate.instant('lang.noBindingMail')); } else { this.notify.success(this.translate.instant('lang.bindingUndefined')); } diff --git a/src/frontend/app/folder/folder-action-list/folder-action-list.component.html b/src/frontend/app/folder/folder-action-list/folder-action-list.component.html index 33acce22eccf45274fe65cba90ea66fa4bf41142..fece321c5406af3aaa1bdf7911221ba367c6c478 100755 --- a/src/frontend/app/folder/folder-action-list/folder-action-list.component.html +++ b/src/frontend/app/folder/folder-action-list/folder-action-list.component.html @@ -38,39 +38,39 @@ <folder-menu [resIds]="selectedRes" (refreshList)="refreshDaoAfterAction()" (refreshFolders)="refreshFolders()"></folder-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('freeze_retention_rule')" mat-menu-item [matMenuTriggerFor]="freezeRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.freezeRetentionRule')"> + [title]="'lang.freezeRetentionRule' | translate "> <mat-icon class="freezeIcon fas fa-snowflake" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.freezeRetentionRule' | translate }}</span> </button> <mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)"> <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > + [title]="'lang.freezeTheCurrentUsefulLife' | translate " > {{ 'lang.freezeTheCurrentUsefulLife' | translate }} </button> <mat-divider></mat-divider> <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > + [title]="'lang.thawTheCurrentUsefulLife' | translate" > {{ 'lang.thawTheCurrentUsefulLife' | translate }} </button> </mat-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('set_binding_document')" mat-menu-item [matMenuTriggerFor]="bindingRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.setBindingDocument')"> + [title]="'lang.setBindingDocument' | translate "> <mat-icon class="bindidngIcon fas fa-exclamation" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.setBindingDocument' | translate }}</span> </button> <mat-menu #bindingRentalRule="matMenu"> <buton mat-menu-item (click)="toogleBinding(true)" class="{{this.isSelectedBinding === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.bindingMail')"> + [title]="'lang.bindingMail' | translate"> {{ 'lang.bindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(false)" class="{{this.isSelectedBinding === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.noBindingMal')"> - {{ 'lang.noBindingMal' | translate}}</buton> + [title]="'lang.noBindingMail' | translate"> + {{ 'lang.noBindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(null)" class="{{this.isSelectedBinding === null ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.doNotDEfine')"> - {{ 'lang.doNotDEfine' | translate}}</buton> + [title]="'lang.doNotDefine' | translate"> + {{ 'lang.doNotDefine' | translate}}</buton> <mat-divider></mat-divider> </mat-menu> </mat-menu> diff --git a/src/frontend/app/folder/folder-action-list/folder-action-list.component.scss b/src/frontend/app/folder/folder-action-list/folder-action-list.component.scss index 380bd884b563c52148acb6debb788ca4be049daf..7ced3138dda02652390616dc8b78e93b5361c369 100644 --- a/src/frontend/app/folder/folder-action-list/folder-action-list.component.scss +++ b/src/frontend/app/folder/folder-action-list/folder-action-list.component.scss @@ -54,7 +54,7 @@ } .isSelectedMenu { - background: rgba(249, 152, 48, 0.14); + background: $secondary; } .notSelectedMenu { diff --git a/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts b/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts index 4029c4c280e7c32ebbf31427b1811e2785ba7a59..57071d8f71e27117fab32c31dd868f08e122eefe 100644 --- a/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts +++ b/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts @@ -47,7 +47,6 @@ export class FolderActionListComponent implements OnInit { @Input() totalRes: number; @Input() contextMode: boolean; @Input() currentFolderInfo: any; - @Input('currentResource') currentResource: any = {}; @Output() refreshEvent = new EventEmitter<string>(); @Output() refreshPanelFolders = new EventEmitter<string>(); @@ -75,9 +74,8 @@ export class FolderActionListComponent implements OnInit { this.contextMenuTitle = row.chrono; this.contextResId = row.resId; - this.currentResource = row; - this.getFreezeBindingValue(this.contextResId); + this.getFreezeBindingValue(this.contextResId); // Opens the menu this.contextMenu.openMenu(); @@ -177,7 +175,7 @@ export class FolderActionListComponent implements OnInit { if (value) { this.notify.success(this.translate.instant('lang.bindingMail')); } else if (value === false) { - this.notify.success(this.translate.instant('lang.noBindingMal')); + this.notify.success(this.translate.instant('lang.noBindingMail')); } else { this.notify.success(this.translate.instant('lang.bindingUndefined')); } diff --git a/src/frontend/app/home/followed-action-list/followed-action-list.component.html b/src/frontend/app/home/followed-action-list/followed-action-list.component.html index 2eb7a6fe2947a2144b53d3ecf5801ea02d168397..512d91e8cccf576a9b943ab088527a42c871c452 100755 --- a/src/frontend/app/home/followed-action-list/followed-action-list.component.html +++ b/src/frontend/app/home/followed-action-list/followed-action-list.component.html @@ -34,39 +34,39 @@ <folder-menu [resIds]="selectedRes" [currentFolders]="folderList" (refreshList)="refreshList()" (refreshFolders)="refreshFolders()"></folder-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('freeze_retention_rule')" mat-menu-item [matMenuTriggerFor]="freezeRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.freezeRetentionRule')"> - <mat-icon class="freezeIcon fas fa-snowflake fa-2x" style="font-size: 20px;"></mat-icon> + [title]="'lang.freezeRetentionRule' | translate "> + <mat-icon class="freezeIcon fas fa-snowflake" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.freezeRetentionRule' | translate }}</span> </button> - <mat-menu #freezeRentalRule = "matMenu"> + <mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)"> <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" > + [title]="'lang.freezeTheCurrentUsefulLife' | translate " > {{ 'lang.freezeTheCurrentUsefulLife' | translate }} </button> <mat-divider></mat-divider> <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" > + [title]="'lang.thawTheCurrentUsefulLife' | translate" > {{ 'lang.thawTheCurrentUsefulLife' | translate }} </button> </mat-menu> <mat-divider></mat-divider> <button *ngIf="privilegeService.hasCurrentUserPrivilege('set_binding_document')" mat-menu-item [matMenuTriggerFor]="bindingRentalRule" [disabled]="selectedRes.length === 0" - [title]="this.translate.instant('lang.setBindingDocument')"> - <mat-icon class="bindidngIcon fas fa-exclamation fa-2x" style="font-size: 20px;"></mat-icon> + [title]="'lang.setBindingDocument' | translate "> + <mat-icon class="bindidngIcon fas fa-exclamation" style="font-size: 20px;"></mat-icon> <span>{{ 'lang.setBindingDocument' | translate }}</span> </button> <mat-menu #bindingRentalRule="matMenu"> <buton mat-menu-item (click)="toogleBinding(true)" class="{{this.isSelectedBinding === true ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.bindingMail')"> + [title]="'lang.bindingMail' | translate"> {{ 'lang.bindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(false)" class="{{this.isSelectedBinding === false ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.noBindingMal')"> - {{ 'lang.noBindingMal' | translate}}</buton> + [title]="'lang.noBindingMail' | translate"> + {{ 'lang.noBindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item (click)="toogleBinding(null)" class="{{this.isSelectedBinding === null ? 'isSelectedMenu' : 'notSelectedMenu'}}" - [title]="this.translate.instant('lang.doNotDEfine')"> - {{ 'lang.doNotDEfine' | translate}}</buton> + [title]="'lang.doNotDefine' | translate"> + {{ 'lang.doNotDefine' | translate}}</buton> <mat-divider></mat-divider> </mat-menu> diff --git a/src/frontend/app/home/followed-action-list/followed-action-list.component.scss b/src/frontend/app/home/followed-action-list/followed-action-list.component.scss index 85ddcb69e47e72a2138b1a6e0c1c37bca573b9ff..5ced5a5b72038139abf5d75fb3f762addcae0dd7 100644 --- a/src/frontend/app/home/followed-action-list/followed-action-list.component.scss +++ b/src/frontend/app/home/followed-action-list/followed-action-list.component.scss @@ -54,7 +54,7 @@ } .isSelectedMenu { - background: rgba(249, 152, 48, 0.14); + background: $secondary; } .notSelectedMenu { diff --git a/src/frontend/app/home/followed-action-list/followed-action-list.component.ts b/src/frontend/app/home/followed-action-list/followed-action-list.component.ts index fd4d09335d5a6d72362bcc7bdcd98e9bee7b2aef..87f3b4597e8d8354b65f00f92ee189c39a523b2d 100644 --- a/src/frontend/app/home/followed-action-list/followed-action-list.component.ts +++ b/src/frontend/app/home/followed-action-list/followed-action-list.component.ts @@ -47,7 +47,6 @@ export class FollowedActionListComponent implements OnInit { @Input() totalRes: number; @Input() contextMode: boolean; @Input() currentFolderInfo: any; - @Input('currentResource') currentResource: any = {}; @Input() menuShortcut: MenuShortcutComponent; @@ -75,7 +74,6 @@ export class FollowedActionListComponent implements OnInit { this.contextMenuTitle = row.chrono; this.contextResId = row.resId; - this.currentResource = row; this.folderList = row.folders !== undefined ? row.folders : []; // Opens the menu @@ -161,7 +159,7 @@ export class FollowedActionListComponent implements OnInit { if (value) { this.notify.success(this.translate.instant('lang.bindingMail')); } else if (value === false) { - this.notify.success(this.translate.instant('lang.noBindingMal')); + this.notify.success(this.translate.instant('lang.noBindingMail')); } else { this.notify.success(this.translate.instant('lang.bindingUndefined')); } diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html index bf0ca77eb2131a6843c5205aaa9cd71f8809069f..dcbec688f0df7eefee0a313095fa7c751b1d61e2 100644 --- a/src/frontend/app/process/process.component.html +++ b/src/frontend/app/process/process.component.html @@ -206,10 +206,10 @@ [title]="this.translate.instant('lang.bindingMail')">{{ 'lang.bindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item [class.isSelectedMenu]="this.resourceBinded === false" (click)="toggleBinding(false)" - [title]="this.translate.instant('lang.noBindingMal')">{{ 'lang.noBindingMal' | translate}}</buton> + [title]="this.translate.instant('lang.noBindingMail')">{{ 'lang.noBindingMail' | translate}}</buton> <mat-divider></mat-divider> <buton mat-menu-item [class.isSelectedMenu]="this.resourceBinded === null" (click)="toggleBinding(null)" - [title]="this.translate.instant('lang.doNotDEfine')">{{ 'lang.doNotDEfine' | translate}}</buton> + [title]="this.translate.instant('lang.doNotDefine')">{{ 'lang.doNotDefine' | translate}}</buton> <mat-divider></mat-divider> </mat-menu> <div class="content-item" *ngIf="this.currentResourceInformations.priority !== undefined"> diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts index b80c4718f7e97ee43458afa292220128f60ff4ae..dd628ac83aa6e1ef37ae85c3f04c49b194082111 100755 --- a/src/frontend/app/process/process.component.ts +++ b/src/frontend/app/process/process.component.ts @@ -864,7 +864,7 @@ export class ProcessComponent implements OnInit, OnDestroy { if (value) { this.notify.success(this.translate.instant('lang.bindingMail')); } else if (value === false) { - this.notify.success(this.translate.instant('lang.noBindingMal')); + this.notify.success(this.translate.instant('lang.noBindingMail')); } else { this.notify.success(this.translate.instant('lang.bindingUndefined')); diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index f6ec3afc1f5a73c1886271eb6ae73d64ab777ae3..19a9c2144b3dffe3ecda17fb098e87569c43720d 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -2116,7 +2116,7 @@ "freezeTheCurrentUsefulLife": "Geler la durée d'utilité courante", "thawTheCurrentUsefulLife": "Dégeler la durée d'utilité courant", "bindingMail": "Document engageant", - "noBindingMal": "Document non engageant", + "noBindingMail": "Document non engageant", "bindingUndefined": "Engagement non défini", "warningConnectionMsg": "Vous pouvez rendre l'application <b>indisponible</b> si les informations sont erronées !", "mappingHeaders": "Interfaçage des en-têtes", @@ -2136,6 +2136,6 @@ "mustPrivilegeToInstall" : "Vous n'avez pas le droit de créer une nouvelle instance", "instancesList" : "Instances présentes", "insteadOf": "À la place de", - "doNotDEfine": "Ne pas définir" + "doNotDefine": "Ne pas définir" }