aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/css/mod_mail.css25
-rwxr-xr-xview/tpl/mail_conv.tpl10
2 files changed, 21 insertions, 14 deletions
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index f0f4458fa..cabfb299f 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -27,24 +27,25 @@
/* message/id */
-.mail-conv-outside-wrapper {
- display: table;
- table-layout: fixed;
-}
-
.mail-conv-sender {
- display: table-cell;
- vertical-align: top;
+ float: left;
margin-right: 10px;
+ margin-bottom: 10px;
+}
+
+.mail-conv-sender img{
+ width: 32px;
+ height: 32px;
}
.mail-conv-sender-name {
font-weight: bold;
}
-.mail-conv-detail {
- display: table-cell;
- vertical-align: top;
- width: 100%;
- padding-left: 10px;
+.mail-conv-body {
+ margin-bottom: 10px;
+}
+
+.mail-conv-body img {
+ max-width: 100%;
}
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 09333ae11..d850df8c2 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -4,9 +4,14 @@
</div>
<div class="mail-conv-detail">
{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
- <div class="mail-conv-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+ <div class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
<div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
- <div class="mail-conv-body">{{$mail.body}}</div>
+ </div>
+ <div class="clear"></div>
+ <div class="mail-conv-content">
+ <div class="mail-conv-body">
+ {{$mail.body}}
+ </div>
<div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
{{if $mail.can_recall}}
<a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-barcode mail-icons"></i></a>
@@ -14,6 +19,7 @@
{{/if}}
<a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
</div>
+ <div class="clear"></div>
</div>
<div class="clear"></div>
</div>