From b7dc914a697134b084470ad274c24fcccdea133d Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 6 Jan 2020 18:11:22 +0100
Subject: [PATCH] FEAT #11405 TIME 0:30 fix css followedDocument
---
src/frontend/app/list/basket-list.component.html | 9 ++++-----
src/frontend/app/list/basket-list.component.ts | 2 +-
src/frontend/lang/lang-en.ts | 2 +-
src/frontend/lang/lang-nl.ts | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 4ede09eeddd..722dbb46a30 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -118,11 +118,10 @@
(change)="toggleRes($event,row)" (click)="$event.stopPropagation();">
</mat-checkbox>
</span>
- <span style="width:30px;">
- <mat-icon [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail" color="primary" style="cursor: pointer;"
- [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']" (click)="$event.stopPropagation();toggleMailTracking(row)">
- </mat-icon>
- </span>
+ <button mat-button (click)="$event.stopPropagation();toggleMailTracking(row)" style="margin-left: -25px; color: #F99830"
+ [title]="row.mailTracking === true ? lang.untrackThisMail : lang.trackThisMail">
+ <mat-icon [ngClass]="[row.mailTracking === true ? 'fas fa-star' : 'far fa-star']"></mat-icon>
+ </button>
<span *ngIf="!appService.getViewMode()" style="cursor:pointer;" class="main-info-status" (click)="launch(defaultAction,row);">
<mat-icon *ngIf="row.isLocked !== true" title="{{row.statusLabel}}" [ngStyle]="{'color': row.priorityColor}" color="primary"
class="{{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}} {{row.statusImage}} {{row.statusImage.charAt(0)}}{{row.statusImage.charAt(1)}}-2x">
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 8c3339a8ea9..411bf04a568 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -300,7 +300,7 @@ export class BasketListComponent implements OnInit {
Object.keys(element).forEach((key) => {
if (key == 'statusImage' && element[key] == null) {
element[key] = 'fa-question undefined';
- } else if ((element[key] == null || element[key] == '') && ['closingDate', 'countAttachments', 'countNotes', 'display', 'folders', 'hasDocument'].indexOf(key) === -1) {
+ } else if ((element[key] == null || element[key] == '') && ['closingDate', 'countAttachments', 'countNotes', 'display', 'folders', 'hasDocument', 'mailTracking'].indexOf(key) === -1) {
element[key] = this.lang.undefined;
}
});
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 74026fe92a8..76ff93e0bc4 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1371,7 +1371,7 @@ export const LANG_EN = {
"communicationMean": "Communication mean",
"communicationMeanDesc": "Link a contact with another Maarch instance",
"see": "see",
- "notSavedBecauseInvalid": "Configuration not updated because some datas are invalid",
+ "notSavedBecauseInvalid": "Configuration not updated because some data are invalid",
"deleteAll": "Delete all",
"followedMail": "Followed mail(s)",
"stopFollowingAlert": "Do you want to stop following these mails ?"
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 81005db16f1..cb3b4c525cf 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1396,7 +1396,7 @@ export const LANG_NL = {
"communicationMean": "Communication mean", //_TO_TRANSLATE
"communicationMeanDesc": "Link a contact with another Maarch instance", //_TO_TRANSLATE
"see": "see", //_TO_TRANSLATE
- "notSavedBecauseInvalid": "Configuration not updated because some datas are invalid", //_TO_TRANSLATE
+ "notSavedBecauseInvalid": "Configuration not updated because some data are invalid", //_TO_TRANSLATE
"deleteAll": "Delete all", //_TO_TRANSLATE
"followedMail": "Followed mail(s)", //_TO_TRANSLATE
"stopFollowingAlert": "Do you want to stop following these mails ?", //_TO_TRANSLATE
--
GitLab