Deuxfleurs/alps
24
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

Handle \Deleted emails in message list

Browse source 
This can happen if an email is deleted by an external client, and this
change fixes a template crash in such cases.

I elected to display (deleted email) rather than to hide deleted
messages so that, if the message is unread, it provides an explanation
for your inbox showing $n unread emails where $n > number of non-deleted
emails.

This partially addresses ~migadu/alps#121
This commit is contained in:
Drew DeVault 2020-10-22 10:32:46 -04:00
parent c20df8da30
commit aaa30ead41
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
themes/alps/assets/style.css
View file

@ -291,6 +291,11 @@ main.create-update .event-date input {
.message-list-unread.message-list-sender,
.message-list-unread.message-list-date { color: black;}
.message-list-unread.message-list-subject {
font-weight: normal;
color: #555;
}
.message-list-date {
text-align: right;
}

32
themes/alps/mailbox.html
View file

@ -34,19 +34,28 @@
<section class="messages">
<div class="message-grid">
{{range .Messages}}
<div class="message-list-checkbox message-list-item {{ if not (.HasFlag "\\Seen") }}message-list-unread{{ end }}">
{{ $classes := "message-list-item" }}
{{ if not (.HasFlag "\\Seen") }}
{{ $classes = printf "%s %s" $classes "message-list-unread" }}
{{ end }}
{{ if (.HasFlag "\\Deleted") }}
{{ $classes = printf "%s %s" $classes "message-list-deleted" }}
{{ end }}
{{ if not (.HasFlag "\\Deleted") }}
<div class="message-list-checkbox {{$classes}}">
<input type="checkbox" name="uids" value="{{.Uid}}" form="messages-form">
</div>
<div class="message-list-sender message-list-item {{ if not (.HasFlag "\\Seen") }}message-list-unread{{ end }}">
{{ range .Envelope.From }}
<div class="message-list-sender {{$classes}}">
{{ range .Envelope.From }}
{{ if .PersonalName }}
{{.PersonalName}}
{{ else }}
{{.MailboxName}}@{{.HostName}}
{{ end }}
{{ end }}
{{ end }}
</div>
<div class="message-list-subject message-list-item {{ if not (.HasFlag "\\Seen") }}message-list-unread{{ end }}">
<div class="message-list-subject {{$classes}}">
<a href="{{if .TextPart}}{{.TextPart.URL false}}{{else}}{{.URL}}{{end}}">
{{if .Envelope.Subject}}
{{.Envelope.Subject}}
@ -55,9 +64,20 @@
{{end}}
</a>
</div>
<div class="message-list-date message-list-item {{ if not (.HasFlag "\\Seen") }}message-list-unread{{ end }}">
<div class="message-list-date {{$classes}}">
{{ .Envelope.Date | formatdate }}
</div>
{{ else }}
<div class="message-list-checkbox {{$classes}}">
<input type="checkbox" form="messages-form" disabled readonly>
</div>
<div class="message-list-sender {{$classes}}"></div>
<div class="message-list-subject {{$classes}}">
<em>(this email was deleted by another client)</em>
</div>
<div class="message-list-date {{$classes}}"></div>
{{ end }}
{{ end }}
{{if not .Messages}}
<p class="empty-list">Nothing here yet.</p>