diff options
Diffstat (limited to 'web-ui/app')
| -rw-r--r-- | web-ui/app/locales/en-us/translation.json | 7 | ||||
| -rw-r--r-- | web-ui/app/locales/en/translation.json | 7 | ||||
| -rw-r--r-- | web-ui/app/locales/sv/translation.json | 2 | ||||
| -rw-r--r-- | web-ui/app/scss/_security.scss | 6 | ||||
| -rw-r--r-- | web-ui/app/templates/mails/single.hbs | 41 |
5 files changed, 28 insertions, 35 deletions
diff --git a/web-ui/app/locales/en-us/translation.json b/web-ui/app/locales/en-us/translation.json index 8cdb419e..2a474c80 100644 --- a/web-ui/app/locales/en-us/translation.json +++ b/web-ui/app/locales/en-us/translation.json @@ -43,10 +43,9 @@ "no_recipient": "<No Recipients>", "you": "you", "encrypted": "Encrypted", - "encrypted encryption-failure": "You are not authorized to see this message.", - "encrypted encryption-error": "Message was encrypted but we couldn't decrypt it.", - "encrypted encryption-valid": "Message was transmitted securely.", - "not-encrypted": "Message was readable during transmission.", + "encrypted encryption-error": "Unable to decrypt", + "encrypted encryption-valid": "Encrypted", + "not-encrypted": "Not Encrypted", "signed": "Certified sender.", "signed signature-revoked": "Sender could not be securely identified.", "signed signature-expired": "Sender could not be securely identified.", diff --git a/web-ui/app/locales/en/translation.json b/web-ui/app/locales/en/translation.json index 8cdb419e..2a474c80 100644 --- a/web-ui/app/locales/en/translation.json +++ b/web-ui/app/locales/en/translation.json @@ -43,10 +43,9 @@ "no_recipient": "<No Recipients>", "you": "you", "encrypted": "Encrypted", - "encrypted encryption-failure": "You are not authorized to see this message.", - "encrypted encryption-error": "Message was encrypted but we couldn't decrypt it.", - "encrypted encryption-valid": "Message was transmitted securely.", - "not-encrypted": "Message was readable during transmission.", + "encrypted encryption-error": "Unable to decrypt", + "encrypted encryption-valid": "Encrypted", + "not-encrypted": "Not Encrypted", "signed": "Certified sender.", "signed signature-revoked": "Sender could not be securely identified.", "signed signature-expired": "Sender could not be securely identified.", diff --git a/web-ui/app/locales/sv/translation.json b/web-ui/app/locales/sv/translation.json index e999ce9d..69557f6a 100644 --- a/web-ui/app/locales/sv/translation.json +++ b/web-ui/app/locales/sv/translation.json @@ -43,7 +43,7 @@ "no_recipient": "<Inga mottagare>", "you": "du", "encrypted": "krypterad", - "encrypted encryption-failure": "Du har inte tillstånd att see det här meddelandet.", + "encrypted encryption-error": "Du har inte tillstånd att see det här meddelandet.", "encrypted encryption-valid": "Meddelandet skickades säkert.", "not-encrypted": "Meddelandet var läsbart medans det var på väg.", "signed": "Certifierad avsändare.", diff --git a/web-ui/app/scss/_security.scss b/web-ui/app/scss/_security.scss index 2a6b60aa..be306d86 100644 --- a/web-ui/app/scss/_security.scss +++ b/web-ui/app/scss/_security.scss @@ -14,12 +14,6 @@ &:before { content: "\f023 \f00c"; } - &.encryption-failure { - background: $error; - &:before { - content: "\f023 \f05e"; - } - } &.encryption-error { background: $attention; &:before { diff --git a/web-ui/app/templates/mails/single.hbs b/web-ui/app/templates/mails/single.hbs index 997ab44f..a74c9606 100644 --- a/web-ui/app/templates/mails/single.hbs +++ b/web-ui/app/templates/mails/single.hbs @@ -1,25 +1,26 @@ <span> - <input type="checkbox" {{#if isChecked }}checked="true"{{/if}} /> + <input type="checkbox" {{#if isChecked }}checked="true"{{/if}} /> </span> <span> - <a href="/#/{{ tag }}/mail/{{ ident }}"> - <span class="received-date">{{ header.formattedDate }} - {{#if attachments}} - <div class="attachment-indicator"> - <i class="fa fa-paperclip"></i> - </div> - {{/if}} - </span> - <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div> - <div class="subject-and-tags"> - {{ header.subject }} + <a href="/#/{{ tag }}/mail/{{ ident }}"> + <span class="received-date">{{ header.formattedDate }} + {{#if attachments}} + <div class="attachment-indicator"> + <i class="fa fa-paperclip"></i> </div> - <div class="subject-and-tags"> - <ul class="tags"> - {{#each tagsForListView }} - <li class="tag" data-tag="{{this}}">{{ this }}</li> - {{/each }} - </ul> - </div> - </a> + {{/if}} + </span> + <div class="from">{{#if header.from }}{{ header.from }}{{else}}{{t "you"}}{{/if}}</div> + <div class="subject-and-tags"> + <i class="fa fa-trash-o"></i> + {{ header.subject }} + </div> + <div class="subject-and-tags"> + <ul class="tags"> + {{#each tagsForListView }} + <li class="tag" data-tag="{{this}}">{{ this }}</li> + {{/each }} + </ul> + </div> + </a> </span> |