moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-01-10 21:18:02 -05:00
Code Issues Releases Wiki Activity

[WO-121] review strings

Browse Source
This commit is contained in:
Tankred Hase 2013-11-18 17:44:59 +01:00
parent 4c4eb89160
commit d892b2c67f
5 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/js/controller/mail-list.js
View File

@ -59,19 +59,14 @@ define(function(require) {
$scope.state.mailList.selected = undefined;
return;
}
// split text only emails into parts for easier rendering
if (!email.html && typeof email.body === 'string') {
email.bodyDisplayParts = [];
var parts = email.body.split('\n');
parts.forEach(function(part) {
if (part.trim().length > 0) {
email.bodyDisplayParts.push(part);
}
});
}
$scope.state.mailList.selected = email;
// split text only emails into parts for easier rendering
if (!email.html && typeof email.body === 'string') {
email.bodyDisplayLines = email.body.split('\n');
}
// mark selected message as 'read'
markAsRead(email);
};
@ -332,11 +327,8 @@ define(function(require) {
this.answered = answered;
this.html = html;
this.sentDate = new Date('Thu Sep 19 2013 20:41:23 GMT+0200 (CEST)');
this.subject = "Welcome Max"; // Subject line
this.body = "Hi Max,\n\n" +
"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.\n\n" +
"Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet.\n\n" +
"Best regards\nYour whiteout team"; // plaintext body
this.subject = 'Getting started'; // Subject line
this.body = 'Here are a few pointers to help you get started with Whiteout Mail.\n\n# Write encrypted message\n- You can compose a message by clicking on the compose button on the upper right (keyboard shortcut is "n" for a new message or "r" to reply).\n- When typing the recipient\'s email address, secure recipients are marked with a blue label and insecure recipients are red.\n- When sending an email to insecure recipients, the default behavior for Whiteout Mail is to invite them to the service and only send the message content in an encrypted form, once they have joined.\n\n# Advanced features\n- To verify a recipient\'s PGP key, you can hover over the blue label containing their email address and their key fingerprint will be displayed.\n- To view your own key fingerprint, open the account view in the navigation bar on the left. You can compare these with your correspondants over a second channel such as a phonecall.\n\nWe hope this helped you to get started with Whiteout Mail.\n\nYour Whiteout Networks team'; // plaintext body
};
var dummys = [new Email(true, true), new Email(true, false, false, true), new Email(false, true, true), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false), new Email(false)];

4
src/js/crypto/pgp.js
View File

@ -180,7 +180,7 @@ define(function(require) {
msg = openpgp.read_message(ciphertext)[0];
} catch (err) {
callback({
errMsg: 'Error decrypting PGP message!',
errMsg: 'Error reading PGP message!',
err: err
});
return;
@ -220,7 +220,7 @@ define(function(require) {
decrypted = msg.decryptAndVerifySignature(keymat, sesskey, senderKey);
} catch (err) {
callback({
errMsg: 'Error decrypting PGP message!',
errMsg: 'Error reading PGP message!',
err: err
});
return;

2
src/manifest.json
View File

@ -1,6 +1,6 @@
{
"name": "Whiteout Mail",
"description": "Simple & elegant email client with integrated end-to-end encryption. Keeping your emails safe has never been so easy.",
"description": "Simple and elegant email client with integrated end-to-end encryption. Keeping your emails safe has never been so easy.",
"version": "x.x.x.x",
"manifest_version": 2,
"offline_enabled": true,

4
src/tpl/login-initial.html
View File

@ -7,7 +7,7 @@
<div ng-switch-when="1">
<h1>Set passphrase</h1>
<p>This is used to protect your keypair. If you forget your passphrase, there is no way to restore your data.</p>
<p>The passphrase protects your keypair. If you forget your passphrase you will not be able to recover your messages.</p>
<form>
<div>
<input type="password" ng-model="state.passphrase" placeholder="Enter passphrase" tabindex="1" focus-me="true">
@ -26,7 +26,7 @@
<div ng-switch-when="4">
<h1>Keypair generated</h1>
<p>Your personal keypair has been generated. You can export it (e.g. to a USB flash drive) to setup whiteout on another computer or as a backup.</p>
<p>Your personal keypair has been generated. You can export it (e.g. to a USB flash drive) to setup Whiteout Mail on another computer or as a backup.</p>
<button ng-click="exportKeypair()" class="btn" tabindex="4">Export now</button>
<button ng-click="proceed()" class="btn" tabindex="5">Do it later</button>
</div>

4
src/tpl/read.html
View File

@ -21,6 +21,8 @@
<div class="body">
<!-- Render parts of a text only email in paragraphs for easier styling -->
<p ng-repeat="part in state.mailList.selected.bodyDisplayParts track by $index">{{part}}</p>
<span ng-repeat="line in state.mailList.selected.bodyDisplayLines track by $index">
{{line}}<br>
</span>
</div><!--/.body-->
</div><!--/.view-read-->