diff --git a/src/app/mail/dialogs/create-folder/create-folder.component.html b/src/app/mail/dialogs/create-folder/create-folder.component.html index c617848a0..3a104e1cf 100644 --- a/src/app/mail/dialogs/create-folder/create-folder.component.html +++ b/src/app/mail/dialogs/create-folder/create-folder.component.html @@ -13,7 +13,7 @@

@@ -28,7 +28,7 @@

@@ -46,8 +46,8 @@

- - + +

diff --git a/src/app/mail/dialogs/create-folder/create-folder.component.scss b/src/app/mail/dialogs/create-folder/create-folder.component.scss index 2e7452453..9e5380cb3 100644 --- a/src/app/mail/dialogs/create-folder/create-folder.component.scss +++ b/src/app/mail/dialogs/create-folder/create-folder.component.scss @@ -46,4 +46,8 @@ .form-control{ font-size: 14px; } - \ No newline at end of file + +// == Modal cotents +.modal-form-label { + font-size: 14px; +} \ No newline at end of file diff --git a/src/app/mail/dialogs/create-folder/create-folder.component.ts b/src/app/mail/dialogs/create-folder/create-folder.component.ts index acb7b0007..7a2d2409d 100644 --- a/src/app/mail/dialogs/create-folder/create-folder.component.ts +++ b/src/app/mail/dialogs/create-folder/create-folder.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { OnDestroy, TakeUntilDestroy } from 'ngx-take-until-destroy'; import { Observable } from 'rxjs/Observable'; -import { AppState, MailBoxesState } from '../../../store/datatypes'; +import { AppState, MailBoxesState, UserState } from '../../../store/datatypes'; import { Store } from '@ngrx/store'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; @@ -20,10 +20,10 @@ export class CreateFolderComponent implements OnInit, OnDestroy { readonly destroyed$: Observable; customFolderForm: FormGroup; - mailBoxesState: MailBoxesState; folderColors: string[] = FOLDER_COLORS; selectedColorIndex: number = 0; currentMailbox: Mailbox; + userState: UserState; constructor(private store: Store, private fb: FormBuilder, @@ -38,11 +38,14 @@ export class CreateFolderComponent implements OnInit, OnDestroy { this.store.select(state => state.mailboxes).takeUntil(this.destroyed$) .subscribe((mailboxes: MailBoxesState) => { - if (this.mailBoxesState && this.mailBoxesState.inProgress && !mailboxes.inProgress) { + this.currentMailbox = mailboxes.currentMailbox; + }); + this.store.select(state => state.user).takeUntil(this.destroyed$) + .subscribe((user: UserState) => { + if (this.userState && this.userState.inProgress && !user.inProgress) { this.activeModal.close(); } - this.mailBoxesState = mailboxes; - this.currentMailbox = mailboxes.currentMailbox; + this.userState = user; }); } @@ -52,7 +55,7 @@ export class CreateFolderComponent implements OnInit, OnDestroy { color: this.folderColors[this.selectedColorIndex], mailbox: this.currentMailbox.id }; - if (this.currentMailbox.customFolders + if (this.userState.customFolders .filter(folder => folder.name.toLowerCase() === customFolder.name.toLowerCase()).length > 0) { this.onHide(); return; diff --git a/src/app/mail/mail-contact/mail-contact.component.html b/src/app/mail/mail-contact/mail-contact.component.html index ebd884eec..693aa3c6f 100644 --- a/src/app/mail/mail-contact/mail-contact.component.html +++ b/src/app/mail/mail-contact/mail-contact.component.html @@ -88,15 +88,15 @@ class="icon icon-garbage">
  • - Compose + Compose
  • - New Contact
  • - Import Contacts + Import Contacts
  • diff --git a/src/app/mail/mail-detail/mail-detail.component.ts b/src/app/mail/mail-detail/mail-detail.component.ts index dca0abbcf..fd7426911 100644 --- a/src/app/mail/mail-detail/mail-detail.component.ts +++ b/src/app/mail/mail-detail/mail-detail.component.ts @@ -42,7 +42,7 @@ export class MailDetailComponent implements OnInit, OnDestroy { } else { const decryptedContent = mailState.decryptedContents[this.mail.id]; if (!decryptedContent || (!decryptedContent.inProgress && !decryptedContent.content && this.mail.content)) { - this.pgpService.decrypt(this.mail.id, this.mail.content); + this.pgpService.decrypt(this.mail.mailbox, this.mail.id, this.mail.content); } if (decryptedContent && !decryptedContent.inProgress && decryptedContent.content) { this.decryptedContents[this.mail.id] = decryptedContent.content; @@ -63,7 +63,7 @@ export class MailDetailComponent implements OnInit, OnDestroy { } else { const childDecryptedContent = mailState.decryptedContents[child.id]; if (!childDecryptedContent || (!childDecryptedContent.inProgress && !childDecryptedContent.content && child.content)) { - this.pgpService.decrypt(child.id, child.content); + this.pgpService.decrypt(child.mailbox, child.id, child.content); } if (childDecryptedContent && !childDecryptedContent.inProgress && childDecryptedContent.content) { this.decryptedContents[child.id] = childDecryptedContent.content; diff --git a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.html b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.html index 5dec757eb..2caf18d7c 100644 --- a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.html +++ b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.html @@ -25,27 +25,30 @@
  • - - + +
  • + [ngbTooltip]="'mail_list.move_to_archive' | translate" + [ngClass]="{'disabled': disableFolderActions}">
  • + placement="top" [ngbTooltip]="'mail_list.move_to_spam' |translate" + [ngClass]="{'disabled': disableFolderActions}">
  • + [ngbTooltip]="(mailFolder !== mailFolderTypes.TRASH) ? ('mail_list.move_to_trash' | translate) : ('mail_list.permanently_delete' | translate)" + [ngClass]="{'disabled': disableFolderActions}">
    • @@ -172,7 +175,7 @@
    - +
    diff --git a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.scss b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.scss index e69de29bb..2017dc582 100644 --- a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.scss +++ b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.scss @@ -0,0 +1,5 @@ +a.disabled { + pointer-events: none; + cursor: default; + color: #9E9E9E; +} \ No newline at end of file diff --git a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.ts b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.ts index 51bb589dc..22a91b220 100644 --- a/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.ts +++ b/src/app/mail/mail-list/mail-folder/generic-folder/generic-folder.component.ts @@ -28,6 +28,7 @@ export class GenericFolderComponent implements OnInit, OnDestroy, OnChanges { mailFolderTypes = MailFolderType; selectAll: boolean; + disableFolderActions: boolean = true; userState: UserState; @@ -62,6 +63,7 @@ export class GenericFolderComponent implements OnInit, OnDestroy, OnChanges { this.store.select(state => state.user).takeUntil(this.destroyed$) .subscribe((user: UserState) => { this.userState = user; + this.customFolders = user.customFolders; if (this.fetchMails && this.userState.settings) { this.LIMIT = user.settings.emails_per_page; if (this.LIMIT) { @@ -71,13 +73,6 @@ export class GenericFolderComponent implements OnInit, OnDestroy, OnChanges { } }); - this.store.select(state => state.mailboxes).takeUntil(this.destroyed$) - .subscribe((mailboxes: MailBoxesState) => { - if (mailboxes.currentMailbox) { - this.customFolders = mailboxes.currentMailbox.customFolders; - } - }); - this.store.select(state => state.search).takeUntil(this.destroyed$) .subscribe((searchState: SearchState) => { // TODO: apply search @@ -119,12 +114,14 @@ export class GenericFolderComponent implements OnInit, OnDestroy, OnChanges { return mail; }); this.selectAll = true; + this.disableFolderActions = false; } else { this.mails.map(mail => { mail.marked = false; return mail; }); this.selectAll = false; + this.disableFolderActions = true; } } @@ -274,6 +271,20 @@ export class GenericFolderComponent implements OnInit, OnDestroy, OnChanges { } } + + toggleEmailSelection(mail, event) { + mail.marked = event; + if (event) { + this.disableFolderActions = false; + } else { + if (this.mails.filter(m => m.marked === true).length > 0) { + this.disableFolderActions = false; + } else { + this.disableFolderActions = true; + } + } + } + /** * @name getMailIDs * @description Get list of comma separated IDs from mail object list diff --git a/src/app/mail/mail-list/mail-list.component.ts b/src/app/mail/mail-list/mail-list.component.ts index 7a78610d5..61f111169 100644 --- a/src/app/mail/mail-list/mail-list.component.ts +++ b/src/app/mail/mail-list/mail-list.component.ts @@ -3,7 +3,7 @@ import { Folder, MailFolderType } from '../../store/models'; import { Observable } from 'rxjs/Observable'; import { OnDestroy, TakeUntilDestroy } from 'ngx-take-until-destroy'; import { ActivatedRoute } from '@angular/router'; -import { AppState, MailBoxesState } from '../../store/datatypes'; +import { AppState, MailBoxesState, UserState } from '../../store/datatypes'; import { Store } from '@ngrx/store'; @TakeUntilDestroy() @@ -28,11 +28,9 @@ export class MailListComponent implements OnInit, OnDestroy { this.mailFolder = params['folder'] as MailFolderType; }); - this.store.select(state => state.mailboxes).takeUntil(this.destroyed$) - .subscribe((mailboxes: MailBoxesState) => { - if (mailboxes.currentMailbox) { - this.customFolders = mailboxes.currentMailbox.customFolders; - } + this.store.select(state => state.user).takeUntil(this.destroyed$) + .subscribe((user: UserState) => { + this.customFolders = user.customFolders; }); } diff --git a/src/app/mail/mail-settings/mail-settings.component.html b/src/app/mail/mail-settings/mail-settings.component.html index 2bca505be..c4dfc86fc 100644 --- a/src/app/mail/mail-settings/mail-settings.component.html +++ b/src/app/mail/mail-settings/mail-settings.component.html @@ -506,32 +506,61 @@

    -
    -
    -
    - -
    -
    - +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    -
    -
    - -
    -
    - -
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + @@ -606,6 +635,118 @@
    +
    +
    + Addresses
    +
    +
    +
    + +
      +
    • + +
      • +
    • +
      +
      +
      + {{mailbox.email}} + Primary + Disabled +
      +
      +
      +
        +
      • + +
        • +
      • + +
        • +
      • + +
        • +
      +
      +
      +
      • +
    +
    +
    +
    Keys
    @@ -615,19 +756,19 @@
    - +
    - -
    @@ -638,17 +779,18 @@
    - +
    - - - - Download public - key - (4096 Bit) - + + + + + Download public key + (4096 Bit) +
    @@ -953,7 +1095,7 @@

    Ch