harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-10-02 04:52:27 -07:00
commit c7160e3d25
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
view/css/mod_mail.css
View File

@ -27,24 +27,25 @@
/* message/id */ /* message/id */
.mail-conv-outside-wrapper { .mail-conv-sender {
display: table; float: left;
table-layout: fixed; margin-right: 10px;
margin-bottom: 10px;
} }
.mail-conv-sender { .mail-conv-sender img{
display: table-cell; width: 32px;
vertical-align: top; height: 32px;
margin-right: 10px;
} }
.mail-conv-sender-name { .mail-conv-sender-name {
font-weight: bold; font-weight: bold;
} }
.mail-conv-detail { .mail-conv-body {
display: table-cell; margin-bottom: 10px;
vertical-align: top; }
width: 100%;
padding-left: 10px; .mail-conv-body img {
max-width: 100%;
} }

37
view/tpl/mail_conv.tpl
View File

@ -4,16 +4,37 @@
</div> </div>
<div class="mail-conv-detail"> <div class="mail-conv-detail">
{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} {{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-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>
<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>&nbsp;{{$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>&nbsp;{{$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>
<div class="clear"></div> <div class="clear"></div>
</div> </div>