diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-02 04:52:27 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-02 04:52:27 -0700 |
| commit | c7160e3d256b40db0c6f9359fc6079a836af1649 (patch) | |
| tree | de6ad9509ed8e19e697289f61c19d264c6d143dc | |
| parent | 6171d164d7ba7270abed3e1ce1d817efd7b83026 (diff) | |
| parent | 9b8aa8d09ec4415ad7da8d07779c1e6b719d159e (diff) | |
| download | volse-hubzilla-c7160e3d256b40db0c6f9359fc6079a836af1649.tar.gz volse-hubzilla-c7160e3d256b40db0c6f9359fc6079a836af1649.tar.bz2 volse-hubzilla-c7160e3d256b40db0c6f9359fc6079a836af1649.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
| -rw-r--r-- | view/css/mod_mail.css | 25 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 37 |
2 files changed, 42 insertions, 20 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..9c0fda483 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -4,16 +4,37 @@ </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 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> - <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a> - {{/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 class="mail-conv-content"> + <div class="mail-conv-body"> + {{$mail.body}} + </div> + <div class="pull-right dropdown"> + <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> + {{if $mail.can_recall}} + <li> + <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="icon-undo mail-icons"></i> {{$mail.recall}}</a> + </li> + {{/if}} + <li> + <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}}"><i class="icon-trash mail-icons"></i> {{$mail.delete}}</a> + </li> + {{if $mail.can_recall}} + <li class="divider"></li> + <li> + <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> + </li> + {{/if}} + </ul> + </div> + <div class="clear"></div> </div> <div class="clear"></div> </div> |