summaryrefslogtreecommitdiff
path: root/templates/webmail
diff options
context:
space:
mode:
Diffstat (limited to 'templates/webmail')
-rw-r--r--templates/webmail/displayheaders.html.ep8
-rw-r--r--templates/webmail/readmail.html.ep89
2 files changed, 5 insertions, 92 deletions
diff --git a/templates/webmail/displayheaders.html.ep b/templates/webmail/displayheaders.html.ep
index 23f48d3..3f650c0 100644
--- a/templates/webmail/displayheaders.html.ep
+++ b/templates/webmail/displayheaders.html.ep
@@ -2,7 +2,7 @@
<div id=displayheaders>
- %= include 'headers/_display_folders';
+ %= include 'displayheaders/_folders';
% if (my $loginmessage = stash 'loginmessage') {
<p id=loginmessage>
@@ -10,10 +10,10 @@
</p>
% }
- %= include 'headers/_display_top_nav';
+ %= include 'displayheaders/_top_nav';
% if (@$msgs) {
- %= include 'headers/_display_headers';
+ %= include 'displayheaders/_main_table';
% }
% else {
<p id=empty-folder>
@@ -21,6 +21,6 @@
</p>
% }
- %= include 'headers/_display_bot_nav';
+ %= include 'displayheaders/_bot_nav';
</div>
diff --git a/templates/webmail/readmail.html.ep b/templates/webmail/readmail.html.ep
index e1f299d..5bdc27e 100644
--- a/templates/webmail/readmail.html.ep
+++ b/templates/webmail/readmail.html.ep
@@ -1,98 +1,11 @@
% layout 'mainlayout';
-% my $mail_fmt = begin
-% my ($category, $value) = @_;
-% if (ref $value eq 'ARRAY' && $value->@*) {
- <dt> <%= uc l $category %> </dt>
-% for ($value->@*) {
- <dd>
-%= $_->{display_name} ? qq("$_->{display_name}" <$_->{address}>) : "$_->{address}"
- </dd>
-% }
-% }
-% end
-
-
-% my $format_mail = begin
-% my ($msg) = @_;
-% my $body = $msg->{body};
-% my $content_type = to_mime_type $msg->{head}{mime};
-
- <div clas="jwm-mail">
-
- <dl class="jwm-mail-header">
- <dt> <%= uc l 'subject' %> </dt>
- <dd> <%= $msg->{head}{subject} %> </dd>
-%= $mail_fmt->(from => $msg->{head}{from})
-%= $mail_fmt->(to => $msg->{head}{to})
-%= $mail_fmt->(cc => $msg->{head}{cc})
-%= $mail_fmt->(bcc => $msg->{head}{bcc})
- <dt> <%= uc l 'date' %> </dt>
- <dd> <%= $msg->{head}{date} %> </dd>
- <dt> <%= uc l 'content-type' %> </dt>
- <dd> <%= $content_type %> </dd>
- </dl>
-
-% if ($content_type eq 'multipart/alternative') {
-% my $end;
-% for (reverse $body->{parts}->@*) {
-% if (!$end) {
- <div class="jwm-mail-body <%= to_mime_type($_->{head}) eq 'text/plain' ? 'jwm-mail-body-text-plain' : '' %>" >
-% my $x = mime_render(to_mime_type($_->{head}), $_->{body});
-%== $x;
- </div>
-% $end = 1 if $x;
-% }
-% else {
- <details class="jwm-mail-body <%= to_mime_type($_->{head}) eq 'text/plain' ? 'jwm-mail-body-text-plain' : '' %>" >
- <summary>
-%= to_mime_type $_->{head}
- </summary>
-%== mime_render(to_mime_type($_->{head}), $_->{body})
- </details>
-% }
-% }
-% }
-% elsif ($msg->{head}{mime}{content_maintype} eq 'multipart') {
-% for ($body->{parts}->@*) {
-% if ( !$_->{head}{content_disposition}
-% || lc $_->{head}{content_disposition} eq 'none'
-% || lc $_->{head}{content_disposition} eq 'inline') {
- <div class="jwm-mail-body <%= to_mime_type($_->{head}) eq 'text/plain' ? 'jwm-mail-body-text-plain' : '' %>" >
-%== mime_render(to_mime_type($_->{head}), $_->{body}) // "Can not render mime-part of type <code>$_->{head}{content_maintype}/$_->{head}{content_subtype}</code>."
- </div>
-% }
-% elsif (lc $_->{head}{content_disposition} eq 'attachment') {
- <p>
- Attachment <%= $_->{head}{filename} %> of type
-%= to_mime_type $_->{head}
- </p>
-% }
-% else {
-% die "unknown Content-Disposition '$_->{head}{content_disposition}'"
-% }
-% }
-% }
-% elsif ($msg->{head}{mime}{content_maintype} eq 'message') {
-% die "not implemented" unless $msg->{head}{mime}{content_subtype} eq 'rfc822';
- <p>not implemented</p>
-% }
-% else {
- <div class="jwm-mail-body <%= $content_type eq 'text/plain' ? 'jwm-mail-body-text-plain' : '' %>" >
-%== mime_render($content_type, $body) // $content_type
- </div>
-% }
-
- </div>
-% end
-
-
<div class="jwm-base">
<h1>Read Mail</h1>
-%= $format_mail->($msg)
+%= $c->render_mail->format_mail($msg)
<nav>
<a href="javascript:history.back()" class="pure-button">