summaryrefslogtreecommitdiff
path: root/web-ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui/app')
-rw-r--r--web-ui/app/js/mail_list_actions/ui/mail_list_actions.js23
-rw-r--r--web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js47
-rw-r--r--web-ui/app/js/page/default.js3
-rw-r--r--web-ui/app/js/page/events.js2
-rw-r--r--web-ui/app/js/services/mail_service.js26
-rw-r--r--web-ui/app/js/services/recover_service.js38
-rw-r--r--web-ui/app/js/views/templates.js1
-rw-r--r--web-ui/app/locales/en-us/translation.json12
-rw-r--r--web-ui/app/scss/_compose.scss8
-rw-r--r--web-ui/app/scss/_read.scss7
-rw-r--r--web-ui/app/templates/mail_actions/actions_box.hbs2
-rw-r--r--web-ui/app/templates/mail_actions/trash_actions_box.hbs5
-rw-r--r--web-ui/app/templates/mails/full_view.hbs2
13 files changed, 155 insertions, 21 deletions
diff --git a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js b/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
index 8987a7d4..2c9c699f 100644
--- a/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
+++ b/web-ui/app/js/mail_list_actions/ui/mail_list_actions.js
@@ -28,6 +28,7 @@ define(
'mail_list_actions/ui/toggle_check_all_trigger',
'mail_list_actions/ui/pagination_trigger',
'mail_list_actions/ui/delete_many_trigger',
+ 'mail_list_actions/ui/recover_many_trigger',
'mail_list_actions/ui/mark_many_as_read_trigger',
'mail_list_actions/ui/mark_as_unread_trigger'
],
@@ -43,6 +44,7 @@ define(
toggleCheckAllMailTrigger,
paginationTrigger,
deleteManyTrigger,
+ recoverManyTrigger,
markManyAsReadTrigger,
markAsUnreadTrigger
) {
@@ -51,14 +53,13 @@ define(
function mailsActions() {
this.render = function() {
- this.$node.html(templates.mailActions.actionsBox({
- txtDeleteButton: this.getTxtDeleteButton()
- }));
+ this.$node.html(this.getActionsBoxTemplate());
refreshTrigger.attachTo('#refresh-trigger');
composeTrigger.attachTo('#compose-trigger');
toggleCheckAllMailTrigger.attachTo('#toggle-check-all-emails');
paginationTrigger.attachTo('#pagination-trigger');
deleteManyTrigger.attachTo('#delete-selected');
+ recoverManyTrigger.attachTo('#recover-selected');
markManyAsReadTrigger.attachTo('#mark-selected-as-read');
markAsUnreadTrigger.attachTo('#mark-selected-as-unread');
refresher.attachTo(document);
@@ -68,19 +69,19 @@ define(
return this.attr.currentTag || urlParams.getTag();
};
- this.getTxtDeleteButton = function() {
- if(this.getCurrentTag() === 'trash') {
- return 'Delete permanently';
- } else {
- return 'Delete';
- }
- };
-
this.updateCurrentTag = function (ev, data) {
this.attr.currentTag = data.tag;
this.render();
};
+ this.getActionsBoxTemplate = function () {
+ if(this.getCurrentTag() === 'trash') {
+ return templates.mailActions.trashActionsBox();
+ } else {
+ return templates.mailActions.actionsBox();
+ }
+ };
+
this.after('initialize', function () {
this.on(document, events.ui.tag.select, this.updateCurrentTag);
this.render();
diff --git a/web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js b/web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js
new file mode 100644
index 00000000..e0a32094
--- /dev/null
+++ b/web-ui/app/js/mail_list_actions/ui/recover_many_trigger.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+define(
+ [
+ 'flight/lib/component',
+ 'views/templates',
+ 'mixins/with_enable_disable_on_event',
+ 'page/events'
+ ],
+
+ function(defineComponent, templates, withEnableDisableOnEvent, events) {
+ 'use strict';
+
+ return defineComponent(recoverManyTrigger, withEnableDisableOnEvent(events.ui.mails.hasMailsChecked));
+
+ function recoverManyTrigger() {
+ this.defaultAttrs({});
+
+ this.getMailsToRecover = function(event) {
+ this.trigger(document, events.ui.mail.wantChecked, this.$node);
+ };
+
+ this.recoverManyEmails = function (event, data) {
+ this.trigger(document, events.ui.mail.recoverMany, data);
+ };
+
+ this.after('initialize', function () {
+ this.on('click', this.getMailsToRecover);
+ this.on(events.ui.mail.hereChecked, this.recoverManyEmails);
+ });
+ }
+ }
+);
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index bbff271f..1571202e 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -27,6 +27,7 @@ define(
'mail_view/data/mail_sender',
'services/mail_service',
'services/delete_service',
+ 'services/recover_service',
'tags/ui/tag_list',
'tags/data/tags',
'page/router',
@@ -56,6 +57,7 @@ define(
mailSender,
mailService,
deleteService,
+ recoverService,
tagList,
tags,
router,
@@ -89,6 +91,7 @@ define(
mailService.attachTo(document);
deleteService.attachTo(document);
+ recoverService.attachTo(document);
tags.attachTo(document);
tagList.attachTo('#tag-list');
diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js
index f1f426f7..cf1b29ad 100644
--- a/web-ui/app/js/page/events.js
+++ b/web-ui/app/js/page/events.js
@@ -55,6 +55,7 @@ define(function () {
updateSelected: 'ui:mail:updateSelected',
delete: 'ui:mail:delete',
deleteMany: 'ui:mail:deleteMany',
+ recoverMany: 'ui:mail:recoverMany',
wantChecked: 'ui:mail:wantChecked',
hereChecked: 'ui:mail:hereChecked',
checked: 'ui:mail:checked',
@@ -108,6 +109,7 @@ define(function () {
unread: 'mail:unread',
delete: 'mail:delete',
deleteMany: 'mail:deleteMany',
+ recoverMany: 'mail:recoverMany',
deleted: 'mail:deleted',
saveDraft: 'draft:save',
draftSaved: 'draft:saved',
diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js
index 1fa41619..04194964 100644
--- a/web-ui/app/js/services/mail_service.js
+++ b/web-ui/app/js/services/mail_service.js
@@ -123,6 +123,16 @@ define(
}, this);
};
+ this.triggerRecovered = function (dataToRecover) {
+ return _.bind(function () {
+ var mails = dataToRecover.mails || [dataToRecover.mail];
+
+ this.refreshMails();
+ this.trigger(document, events.ui.userAlerts.displayMessage, { message: dataToRecover.successMessage});
+ this.trigger(document, events.ui.mails.uncheckAll);
+ }, this);
+ };
+
this.deleteMail = function (ev, data) {
monitoredAjax(this, '/mail/' + data.mail.ident,
{type: 'DELETE'})
@@ -145,6 +155,21 @@ define(
.fail(this.errorMessage(i18n('Could not delete emails')));
};
+ this.recoverManyMails = function (ev, data) {
+ var dataToRecover = data;
+ var mailIdents = _.map(data.mails, function (mail) {
+ return mail.ident;
+ });
+
+ monitoredAjax(this, '/mails/recover', {
+ type: 'POST',
+ dataType: 'json',
+ contentType: 'application/json; charset=utf-8',
+ data: JSON.stringify({idents: mailIdents})
+ }).done(this.triggerRecovered(dataToRecover))
+ .fail(this.errorMessage(i18n('Could not move emails to inbox')));
+ };
+
function compileQuery(data) {
var query = 'tag:"' + that.attr.currentTag + '"';
@@ -273,6 +298,7 @@ define(
this.on(document, events.mail.unread, this.unreadMail);
this.on(document, events.mail.delete, this.deleteMail);
this.on(document, events.mail.deleteMany, this.deleteManyMails);
+ this.on(document, events.mail.recoverMany, this.recoverManyMails);
this.on(document, events.search.perform, this.newSearch);
this.on(document, events.ui.tag.selected, this.fetchByTag);
this.on(document, events.ui.tag.select, this.fetchByTag);
diff --git a/web-ui/app/js/services/recover_service.js b/web-ui/app/js/services/recover_service.js
new file mode 100644
index 00000000..62fcf1f9
--- /dev/null
+++ b/web-ui/app/js/services/recover_service.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define(['flight/lib/component', 'page/events', 'views/i18n'], function (defineComponent, events, i18n) {
+ 'use strict';
+
+ return defineComponent(function() {
+
+ this.recoverManyEmails = function (event, data) {
+ var emails = _.values(data.checkedMails);
+
+ this.trigger(document, events.mail.recoverMany, {
+ mails: emails,
+ successMessage: i18n('Your messages were moved to inbox!')
+ });
+
+ };
+
+ this.after('initialize', function () {
+ this.on(document, events.ui.mail.recoverMany, this.recoverManyEmails);
+ });
+
+ });
+});
diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js
index 64e269ca..5e991a20 100644
--- a/web-ui/app/js/views/templates.js
+++ b/web-ui/app/js/views/templates.js
@@ -46,6 +46,7 @@ define(['hbs/templates'], function (templates) {
},
mailActions: {
actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'],
+ trashActionsBox: window.Pixelated['app/templates/mail_actions/trash_actions_box.hbs'],
composeTrigger: window.Pixelated['app/templates/mail_actions/compose_trigger.hbs'],
refreshTrigger: window.Pixelated['app/templates/mail_actions/refresh_trigger.hbs'],
paginationTrigger: window.Pixelated['app/templates/mail_actions/pagination_trigger.hbs']
diff --git a/web-ui/app/locales/en-us/translation.json b/web-ui/app/locales/en-us/translation.json
index 330e38b6..4dd90e90 100644
--- a/web-ui/app/locales/en-us/translation.json
+++ b/web-ui/app/locales/en-us/translation.json
@@ -46,12 +46,12 @@
"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 identifiedw",
- "signed signature-expired": "Sender could not be securely identified",
- "signed signature-not-trusted": "Sender and/or message cannot be trusted",
- "signed signature-unknown": "Sender and/or message cannot be trusted",
- "not-signed": "Uncertified sender",
+ "signed": "Verified sender",
+ "signed signature-revoked": "Unreliable signature",
+ "signed signature-expired": "Unreliable signature",
+ "signed signature-not-trusted": "Unreliable signature",
+ "signed signature-unknown": "Unreliable signature",
+ "not-signed": "Not signed",
"send-button": "Send",
"sending-mail": "Sending...",
"draft-button": "Save Draft",
diff --git a/web-ui/app/scss/_compose.scss b/web-ui/app/scss/_compose.scss
index c026b866..acff745d 100644
--- a/web-ui/app/scss/_compose.scss
+++ b/web-ui/app/scss/_compose.scss
@@ -24,7 +24,8 @@
// COMPOSE PANE
#compose-box, #draft-box, #reply-box {
- margin: 0 0 50px 10px;
+ margin: 5px 0 50px 30px;
+ padding: 0;
.input-container {
border-bottom: 1px solid #DDD;
padding: 1px;
@@ -44,7 +45,6 @@
&#subject {
font-size: 1.6875rem;
line-height: 1.4;
- margin-top: 26px;
}
}
textarea {
@@ -85,6 +85,10 @@
}
}
+ button.close-mail-button {
+ margin: 1px;
+ }
+
@include recipients;
}
diff --git a/web-ui/app/scss/_read.scss b/web-ui/app/scss/_read.scss
index 7235df72..d621f672 100644
--- a/web-ui/app/scss/_read.scss
+++ b/web-ui/app/scss/_read.scss
@@ -32,6 +32,13 @@
height: 27px;
margin-right: 3px;
}
+
+ .full-view-header {
+ display:inline-block;
+ padding-top: 5px;
+ width:95%;
+ flex-shrink:1;
+ }
}
h3 {
margin-bottom: 0;
diff --git a/web-ui/app/templates/mail_actions/actions_box.hbs b/web-ui/app/templates/mail_actions/actions_box.hbs
index 628a6240..b6dc2f53 100644
--- a/web-ui/app/templates/mail_actions/actions_box.hbs
+++ b/web-ui/app/templates/mail_actions/actions_box.hbs
@@ -1,6 +1,6 @@
<li><input type="checkbox" id="toggle-check-all-emails"/></li>
<li><input type="button" id="mark-selected-as-read" value="{{t 'Mark as read'}}" disabled="disabled"/></li>
<li><input type="button" id="mark-selected-as-unread" value="{{t 'Mark as unread'}}" disabled="disabled"/></li>
-<li><input type="button" id="delete-selected" value="{{t txtDeleteButton}}" disabled="disabled"/></li>
+<li><input type="button" id="delete-selected" value="{{t 'Delete'}}" disabled="disabled"/></li>
<li id="pagination-trigger" class="right"></li>
<li id="refresh-trigger" class="right"></li>
diff --git a/web-ui/app/templates/mail_actions/trash_actions_box.hbs b/web-ui/app/templates/mail_actions/trash_actions_box.hbs
new file mode 100644
index 00000000..7852bd6f
--- /dev/null
+++ b/web-ui/app/templates/mail_actions/trash_actions_box.hbs
@@ -0,0 +1,5 @@
+<li><input type="checkbox" id="toggle-check-all-emails"/></li>
+<li><input type="button" id="delete-selected" value="{{t 'Delete permanently'}}" disabled="disabled"/></li>
+<li><input type="button" id="recover-selected" value="{{t 'Move to Inbox'}}" disabled="disabled"/></li>
+<li id="pagination-trigger" class="right"></li>
+<li id="refresh-trigger" class="right"></li>
diff --git a/web-ui/app/templates/mails/full_view.hbs b/web-ui/app/templates/mails/full_view.hbs
index a5c41121..77994860 100644
--- a/web-ui/app/templates/mails/full_view.hbs
+++ b/web-ui/app/templates/mails/full_view.hbs
@@ -8,7 +8,7 @@
</button>
- <div style="display:inline-block;padding-top: 5px;width:95%;flex-shrink:1" >
+ <div class="full-view-header">
<div class="column large-12 no-padding security-status">
{{#if signatureStatus}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:43:58 +0000