1 files changed, 39 insertions, 31 deletions
diff --git a/templates/webmail/readmail.html.ep b/templates/webmail/readmail.html.ep
index 0a9fde0..f39dd0e 100644
--- a/templates/webmail/readmail.html.ep
+++ b/templates/webmail/readmail.html.ep
@@ -3,54 +3,62 @@
 % my $mail_fmt = begin
   % my ($category, $value) = @_;
   <dt> <%= ucfirst l $category %> </dt>
-  <dd> <%= ref $value ? join(' ' . l('and') . ' ', map {"$_->{name} <$_->{address}>"} @$value) : $value %> </dd>
+  <dd>
+    %= ref $value ? join(' ' . l('and') . ' ', map {"$_->{name} <$_->{address}>"} @$value) : $value
+  </dd>
 % end
 
-<div class=ow>
-
-<h1>Read Mail</h1>
-
-<dl id=show-head>
-  <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}) if !ref $msg->{head}{cc} || @{ $msg->{head}{cc} };
-%= $mail_fmt->('bcc', $msg->{head}{bcc}) if !ref $msg->{head}{bcc} || @{ $msg->{head}{bcc} };
-  <dt> <%= uc l 'date' %> </dt>
-  <dd> <%= $msg->{head}{date} %> </dd>
-  <dt> <%= uc l 'size' %> </dt>
-  <dd> <%= print_sizes10 $msg->{size} %> </dd>
-  <dt> <%= uc l 'content-type' %> </dt>
-  <dd> <%= $msg->{head}{content_type} %> </dd>
-</dl>
+<div class="jwm-base">
+
+  <h1>Read Mail</h1>
+
+  <dl>
+    <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}) if !ref $msg->{head}{cc} || @{ $msg->{head}{cc} }
+    %= $mail_fmt->('bcc', $msg->{head}{bcc}) if !ref $msg->{head}{bcc} || @{ $msg->{head}{bcc} }
+
+    <dt> <%= uc l 'date' %> </dt>
+    <dd> <%= $msg->{head}{date} %> </dd>
+
+    <dt> <%= uc l 'size' %> </dt>
+    <dd> <%= print_sizes10 $msg->{size} %> </dd>
+
+    <dt> <%= uc l 'content-type' %> </dt>
+    <dd> <%= $msg->{head}{content_type} %> </dd>
+  </dl>
 
 % my $body = $msg->{body};
 
 % if ($msg->{head}{content_type} eq 'multipart/alternative') {
 %   for (reverse @$body) {
-      <div class=show-body>
+  <div class=jwm-mail-body>
 %       my $x = mime_render($_->{head}{content_type}, $_->{body});
-%==     $x;
-      </div>
+    %== $x;
+  </div>
 %       last if $x;
 %   }
 % }
 % elsif (ref $body eq 'HASH') {
 %   for (%$body) {
-      <div class=show-body>
-%==     mime_render($_->{head}{content_type}, $_->{body});
-      </div>
+  <div class=jwm-mail-body>
+    %== mime_render($_->{head}{content_type}, $_->{body});
+  </div>
 %   }
 % }
 % else {
-    <div class=show-body>
-%==   mime_render($msg->{head}{content_type}, $body);
-    </div>
+  <div class=jwm-mail-body>
+    %== mime_render($msg->{head}{content_type}, $body);
+  </div>
 % }
 
-<nav id=read-nav>
-  <a href="javascript:history.back()" class=btn> <%= l 'home' %> </a>
-</nav>
+  <nav>
+    <a href="javascript:history.back()" class="pure-button">
+      %= l 'back'
+    </a>
+  </nav>
 
 </div>