diff options
Diffstat (limited to 'web-ui/app')
-rw-r--r-- | web-ui/app/index.html | 44 | ||||
-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/scss/styles.scss | 2 | ||||
-rw-r--r-- | web-ui/app/templates/mails/single.hbs | 41 |
7 files changed, 51 insertions, 58 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 503cdde6..d6e03de0 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -21,28 +21,28 @@ <div class="inner-wrap"> <section id="left-pane" class="left-off-canvas-menu"> <a class="left-off-canvas-logo" href="#"> - <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="30.4 316.8 555.2 155.2" enable-background="new 30.4 316.8 555.2 155.2" xml:space="preserve"> - <g> - <path fill="#3E3B38" d="M30.4,355.5v77.8L98.9,472l68.5-38.7v-77.8l-68.5-38.7L30.4,355.5z M96,443.9l-39.9-22v-47.7L96,396.9 - V443.9z M141.2,421.8l-39.4,22v-47l39.4-23C141.2,373.8,141.2,421.8,141.2,421.8z M141.2,367.5l-42.4,25.2l-42.8-25.2l42.8-23 - L141.2,367.5z"/> - <path fill="#3E3B38" d="M214.9,363.1h-21.8v64.6h14.7v-24h7.1c12.7,0,22-7.3,22-20.8C237,369.7,227.4,363.1,214.9,363.1z M212,392 - h-4.2v-17.1h4.2c5.9,0,11.3,2,11.3,8.6S217.9,392,212,392z"/> - <rect x="241.9" y="363.1" fill="#3E3B38" width="14.7" height="64.6"/> - <polygon fill="#3E3B38" points="320.7,363.1 302.3,363.1 290.3,380.7 278.3,363.1 261,363.1 281.3,392.9 259.2,427.7 277.6,427.7 - 290.3,405.7 303.1,427.7 322.2,427.7 299.4,392.9 "/> - <polygon fill="#3E3B38" points="324.6,427.7 361.6,427.7 361.6,414.7 339.3,414.7 339.3,401.8 360.6,401.8 360.6,388.8 - 339.3,388.8 339.3,376 361.6,376 361.6,363.1 324.6,363.1 "/> - <path fill="#3E3B38" d="M416.6,363.1l-20.8,51.7h-14.4v-51.7h-14.7v64.6h24h13h2.9l4.9-13H436l4.9,13h15.9l-26.2-64.6H416.6z - M416.2,401.8l7.1-18.8h0.2l7.1,18.8H416.2z"/> - <polygon fill="#3E3B38" points="444.1,376 459.5,376 459.5,427.7 474.2,427.7 474.2,376 489.6,376 489.6,363.1 444.1,363.1 "/> - <polygon fill="#3E3B38" points="494.5,427.7 531.5,427.7 531.5,414.7 509.4,414.7 509.4,401.8 530.7,401.8 530.7,388.8 - 509.4,388.8 509.4,376 531.5,376 531.5,363.1 494.5,363.1 "/> - <path fill="#3E3b38" d="M553,363.1h-16.2v64.6H553c17.9,0,32.6-13.5,32.6-32.3C585.6,376.5,570.6,363.1,553,363.1z M553.5,414.5 - h-2.2v-38.2h2.2c11,0,18.4,8.3,18.4,19.1C571.9,406.2,564.5,414.5,553.5,414.5z"/> - </g> - </svg> + <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="30.4 316.8 555.2 155.2" enable-background="new 30.4 316.8 555.2 155.2" xml:space="preserve"> + <g> + <path fill="#3E3B38" d="M30.4,355.5v77.8L98.9,472l68.5-38.7v-77.8l-68.5-38.7L30.4,355.5z M96,443.9l-39.9-22v-47.7L96,396.9 + V443.9z M141.2,421.8l-39.4,22v-47l39.4-23C141.2,373.8,141.2,421.8,141.2,421.8z M141.2,367.5l-42.4,25.2l-42.8-25.2l42.8-23 + L141.2,367.5z"/> + <path fill="#3E3B38" d="M214.9,363.1h-21.8v64.6h14.7v-24h7.1c12.7,0,22-7.3,22-20.8C237,369.7,227.4,363.1,214.9,363.1z M212,392 + h-4.2v-17.1h4.2c5.9,0,11.3,2,11.3,8.6S217.9,392,212,392z"/> + <rect x="241.9" y="363.1" fill="#3E3B38" width="14.7" height="64.6"/> + <polygon fill="#3E3B38" points="320.7,363.1 302.3,363.1 290.3,380.7 278.3,363.1 261,363.1 281.3,392.9 259.2,427.7 277.6,427.7 + 290.3,405.7 303.1,427.7 322.2,427.7 299.4,392.9 "/> + <polygon fill="#3E3B38" points="324.6,427.7 361.6,427.7 361.6,414.7 339.3,414.7 339.3,401.8 360.6,401.8 360.6,388.8 + 339.3,388.8 339.3,376 361.6,376 361.6,363.1 324.6,363.1 "/> + <path fill="#3E3B38" d="M416.6,363.1l-20.8,51.7h-14.4v-51.7h-14.7v64.6h24h13h2.9l4.9-13H436l4.9,13h15.9l-26.2-64.6H416.6z + M416.2,401.8l7.1-18.8h0.2l7.1,18.8H416.2z"/> + <polygon fill="#3E3B38" points="444.1,376 459.5,376 459.5,427.7 474.2,427.7 474.2,376 489.6,376 489.6,363.1 444.1,363.1 "/> + <polygon fill="#3E3B38" points="494.5,427.7 531.5,427.7 531.5,414.7 509.4,414.7 509.4,401.8 530.7,401.8 530.7,388.8 + 509.4,388.8 509.4,376 531.5,376 531.5,363.1 494.5,363.1 "/> + <path fill="#3E3b38" d="M553,363.1h-16.2v64.6H553c17.9,0,32.6-13.5,32.6-32.3C585.6,376.5,570.6,363.1,553,363.1z M553.5,414.5 + h-2.2v-38.2h2.2c11,0,18.4,8.3,18.4,19.1C571.9,406.2,564.5,414.5,553.5,414.5z"/> + </g> + </svg> </a> <a class="side-nav-toggle side-nav-toggle-icon" href="#"> <i class="toggle fa fa-navicon"></i> 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/scss/styles.scss b/web-ui/app/scss/styles.scss index 2e47dad7..6dd82c4e 100644 --- a/web-ui/app/scss/styles.scss +++ b/web-ui/app/scss/styles.scss @@ -429,7 +429,7 @@ section { } &#middle-pane { - background: lighten($contrast, 2%); + background: $contrast; @include email-list; } 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> |