mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Simplify message .priorityHigh
This commit is contained in:
parent
a3a4a057e5
commit
7dc4b283b3
5 changed files with 19 additions and 12 deletions
|
|
@ -156,7 +156,6 @@ export class MessageModel extends AbstractModel {
|
||||||
this.addComputables({
|
this.addComputables({
|
||||||
attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()),
|
attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()),
|
||||||
threadsLen: () => this.threads().length,
|
threadsLen: () => this.threads().length,
|
||||||
isImportant: () => MessagePriority.High === this.priority(),
|
|
||||||
hasAttachments: () => this.attachments().hasVisible(),
|
hasAttachments: () => this.attachments().hasVisible(),
|
||||||
|
|
||||||
isUnseen: () => !this.flags().includes('\\seen'),
|
isUnseen: () => !this.flags().includes('\\seen'),
|
||||||
|
|
@ -370,7 +369,7 @@ export class MessageModel extends AbstractModel {
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
lineAsCss() {
|
lineAsCss(flags=1) {
|
||||||
let classes = [];
|
let classes = [];
|
||||||
forEachObjectEntry({
|
forEachObjectEntry({
|
||||||
deleted: this.deleted(),
|
deleted: this.deleted(),
|
||||||
|
|
@ -378,13 +377,13 @@ export class MessageModel extends AbstractModel {
|
||||||
checked: this.checked(),
|
checked: this.checked(),
|
||||||
unseen: this.isUnseen(),
|
unseen: this.isUnseen(),
|
||||||
focused: this.focused(),
|
focused: this.focused(),
|
||||||
important: this.isImportant(),
|
priorityHigh: this.priority() === MessagePriority.High,
|
||||||
withAttachments: !!this.attachments().length,
|
withAttachments: !!this.attachments().length,
|
||||||
// hasChildrenMessage: 1 < this.threadsLen(),
|
// hasChildrenMessage: 1 < this.threadsLen(),
|
||||||
hasUnseenSubMessage: this.hasUnseenSubMessage(),
|
hasUnseenSubMessage: this.hasUnseenSubMessage(),
|
||||||
hasFlaggedSubMessage: this.hasFlaggedSubMessage()
|
hasFlaggedSubMessage: this.hasFlaggedSubMessage()
|
||||||
}, (key, value) => value && classes.push(key));
|
}, (key, value) => value && classes.push(key));
|
||||||
this.flags().forEach(value => classes.push('msgflag-'+value));
|
flags && this.flags().forEach(value => classes.push('msgflag-'+value));
|
||||||
return classes.join(' ');
|
return classes.join(' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -211,11 +211,10 @@ html:not(rl-mobile) {
|
||||||
border-left-color: #ccc;
|
border-left-color: #ccc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.priorityHigh::before {
|
&.priorityHigh .subjectParent::before {
|
||||||
content: '! '; /*❗*/
|
content: '! '; /*❗*/
|
||||||
color: red;
|
color: red;
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
margin-right: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.deleted {
|
&.deleted {
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,12 @@ html.rl-no-preview-pane {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.priorityHigh .subject::before {
|
||||||
|
content: '! '; /*❗*/
|
||||||
|
color: red;
|
||||||
|
font-weight: bolder;
|
||||||
|
}
|
||||||
|
|
||||||
.b-content {
|
.b-content {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
@ -79,7 +85,6 @@ html.rl-no-preview-pane {
|
||||||
.flagParent {
|
.flagParent {
|
||||||
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin: 0 0.25em;
|
|
||||||
|
|
||||||
.flagOn {
|
.flagOn {
|
||||||
color: orange;
|
color: orange;
|
||||||
|
|
@ -106,6 +111,10 @@ html.rl-no-preview-pane {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|
||||||
|
.fontastic + span {
|
||||||
|
margin-left: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
.subjectParent {
|
.subjectParent {
|
||||||
display: flex;
|
display: flex;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
|
|
@ -118,6 +127,7 @@ html.rl-no-preview-pane {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
margin: 0 0.25em;
|
||||||
}
|
}
|
||||||
.subject:empty {
|
.subject:empty {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@
|
||||||
<i data-bind="css: attachmentIconClass"></i>
|
<i data-bind="css: attachmentIconClass"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="subjectParent actionHandle" data-bind="css: {'priorityHigh': isImportant}, text: subject"></div>
|
<div class="subjectParent actionHandle" data-bind="text: subject"></div>
|
||||||
|
|
||||||
<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
|
<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ko if: message -->
|
<!-- ko if: message -->
|
||||||
<div class="b-message" data-bind="i18nUpdate: message">
|
<div class="b-message" data-bind="i18nUpdate: message, css: message().lineAsCss(0)">
|
||||||
<div class="message-fixed-button-toolbar">
|
<div class="message-fixed-button-toolbar">
|
||||||
<a class="btn btn-success buttonEdit fontastic hide-mobile" data-bind="visible: isDraftFolder(), command: messageEditCommand">🖉</a>
|
<a class="btn btn-success buttonEdit fontastic hide-mobile" data-bind="visible: isDraftFolder(), command: messageEditCommand">🖉</a>
|
||||||
<div class="btn-group" style="margin-right: -8px; display: inline;">
|
<div class="btn-group" style="margin-right: -8px; display: inline;">
|
||||||
|
|
@ -122,7 +122,6 @@
|
||||||
<div class="subjectParent">
|
<div class="subjectParent">
|
||||||
<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: function() { showFullInfo(!showFullInfo()); }">ℹ</span>
|
<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: function() { showFullInfo(!showFullInfo()); }">ℹ</span>
|
||||||
<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {'flagOn': message().isFlagged(), 'flagOff': !message().isFlagged()}"></span>
|
<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {'flagOn': message().isFlagged(), 'flagOff': !message().isFlagged()}"></span>
|
||||||
<b style="color: red; margin-right: 5px" data-bind="visible: message().isImportant()">!</b>
|
|
||||||
<span class="subject" data-bind="text: message().subject, title: message().subject, event: { 'dblclick': toggleFullScreen }"></span>
|
<span class="subject" data-bind="text: message().subject, title: message().subject, event: { 'dblclick': toggleFullScreen }"></span>
|
||||||
<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
|
<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -207,7 +206,7 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- /ko -->
|
<!-- /ko -->
|
||||||
</div>
|
</div>
|
||||||
<div id="messageItem" data-bind="css: message().lineAsCss()">
|
<div id="messageItem">
|
||||||
<div tabindex="0" data-bind="hasfocus: messageDomFocused">
|
<div tabindex="0" data-bind="hasfocus: messageDomFocused">
|
||||||
|
|
||||||
<span class="buttonFull" data-bind="click: toggleFullScreen">
|
<span class="buttonFull" data-bind="click: toggleFullScreen">
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue