Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-09 09:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2016-07-17 18:03:38 +03:00
parent 278e98561d
commit 786873041f
8 changed files with 561 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dev/Model/Message.jsx
View file

@ -247,7 +247,7 @@ class MessageModel extends AbstractModel
this.bcc = emailArrayFromJson(json.Bcc);
this.replyTo = emailArrayFromJson(json.ReplyTo);
this.deliveredTo = emailArrayFromJson(json.DeliveredTo);
this.unsubsribeLinks = json.UnsubsribeLinks;
this.unsubsribeLinks = isNonEmptyArray(json.UnsubsribeLinks) ? json.UnsubsribeLinks : [];
this.subject(json.Subject);
if (isArray(json.SubjectParts))
@ -358,6 +358,20 @@ class MessageModel extends AbstractModel
return result;
}
/**
* @returns {boolean}
*/
hasUnsubsribeLinks() {
return this.unsubsribeLinks && 0 < this.unsubsribeLinks.length;
}
/**
* @returns {string}
*/
getFirstUnsubsribeLink() {
return this.unsubsribeLinks && 0 < this.unsubsribeLinks.length ? (this.unsubsribeLinks[0] || '') : '';
}
/**
* @param {AjaxJsonMessage} json
* @returns {boolean}

19
dev/Settings/Admin/Security.jsx
View file

@ -4,7 +4,7 @@ import ko from 'ko';
import {createCommand, trim, boolToAjax} from 'Common/Utils';
import {phpInfo} from 'Common/Links';
import {StorageResultType} from 'Common/Enums';
import {StorageResultType, Magics} from 'Common/Enums';
import {settingsGet} from 'Storage/Settings';
@ -42,6 +42,10 @@ class SecurityAdminSettings
}
});
this.isTwoFactorDropperShown = ko.observable(false);
this.twoFactorDropperUser = ko.observable('');
this.twoFactorDropperUser.focused = ko.observable(false);
this.adminLogin = ko.observable(settingsGet('AdminLogin'));
this.adminLoginError = ko.observable(false);
this.adminPassword = ko.observable('');
@ -102,6 +106,15 @@ class SecurityAdminSettings
this.onNewAdminPasswordResponse = _.bind(this.onNewAdminPasswordResponse, this);
}
showTwoFactorDropper() {
this.twoFactorDropperUser('');
this.isTwoFactorDropperShown(true);
_.delay(() => {
this.twoFactorDropperUser.focused(true);
}, Magics.Time50ms);
}
onNewAdminPasswordResponse(result, data) {
if (StorageResultType.Success === result && data && data.Result)
{
@ -161,6 +174,10 @@ class SecurityAdminSettings
this.adminPassword('');
this.adminPasswordNew('');
this.adminPasswordNew2('');
this.isTwoFactorDropperShown(false);
this.twoFactorDropperUser('');
this.twoFactorDropperUser.focused(false);
}
/**

2
dev/View/User/MailBox/MessageView.js
View file

@ -375,7 +375,7 @@ function MessageViewMailBoxUserView()
this.viewSize(oMessage.friendlySize());
this.viewLineAsCss(oMessage.lineAsCss());
this.viewViewLink(oMessage.viewLink());
this.viewUnsubscribeLink(oMessage.unsubsribeLinks[0]);
this.viewUnsubscribeLink(oMessage.getFirstUnsubsribeLink());
this.viewDownloadLink(oMessage.downloadLink());
this.viewIsImportant(oMessage.isImportant());
this.viewIsFlagged(oMessage.flagged());

35
rainloop/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
View file

@ -1,6 +1,6 @@
<div class="adminSecurity g-ui-user-select-none">
<div class="form-horizontal">
<div class="legend" data-i18n="TAB_SECURITY/LEGEND_SECURITY"></div>
<div class="form-horizontal">
<div class="control-group">
<div class="controls">
<div data-bind="component: {
@ -21,8 +21,34 @@
inline: true
}
}"></div>
</div>
</div>
</div>
<!--
<div class="form-horizontal">
<div class="control-group" data-bind="visible: isTwoFactorDropperShown()">
<div class="controls">
<div class="input-append">
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: twoFactorDropperUser, hasfocus: twoFactorDropperUser.focused" placeholder="Email"/>
<button class="btn">
<i class="icon-spinner animated" data-bind="visible: true"></i>
<span data-bind="visible: false">OK</span>
</button>
</div>
</div>
</div>
<div class="control-group" data-bind="visible: !isTwoFactorDropperShown()">
<div class="controls">
<span class="g-ui-link" data-bind="click: showTwoFactorDropper">Drop user keys</span>
</div>
</div>
</div>
<br />
<br />
-->
<div class="form-horizontal">
<div class="control-group">
<div class="controls">
<div data-bind="component: {
name: 'Checkbox',
params: {
@ -38,14 +64,11 @@
inline: true
}
}"></div>
&nbsp;&nbsp;
<span style="color:red">(<span data-i18n="HINTS/BETA"></span>)</span>
</div>
</div>
<div class="control-group">
<div class="controls">
<a href="#" target="_blank" class="g-ui-link" data-bind="link: phpInfoLink()"
data-i18n="TAB_SECURITY/LABEL_SHOW_PHP_INFO"></a>
<a href="#" target="_blank" class="g-ui-link" data-bind="link: phpInfoLink()" data-i18n="TAB_SECURITY/LABEL_SHOW_PHP_INFO"></a>
</div>
</div>
</div>

2
rainloop/v/0.0.0/app/templates/Views/User/MailMessageView.html
View file

@ -147,7 +147,7 @@
<span class="i18n" data-i18n="MESSAGE/BUTTON_DELETE"></span>
</a>
</li>
<li class="e-item" role="presentation" data-bind="visible: message() && message().unsubsribeLinks[0]">
<li class="e-item" role="presentation" data-bind="visible: message() && message().hasUnsubsribeLinks()">
<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="link: viewUnsubscribeLink()">
<i class="icon-remove"></i>
&nbsp;&nbsp;