aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/mail_conv.tpl
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2015-10-26 21:55:47 +0100
committermrjive <mrjive@mrjive.it>2015-10-26 21:55:47 +0100
commita4c3058f845a1c38d06b2201a10700c5f878366d (patch)
treebab86468397e523457ba25199cb9a67265980e00 /view/tpl/mail_conv.tpl
parent32522b61f235266384c81c0669fceaf58afeb4fe (diff)
parent6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff)
downloadvolse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz
volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2
volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip
Merge pull request #7 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/tpl/mail_conv.tpl')
-rwxr-xr-xview/tpl/mail_conv.tpl38
1 files changed, 30 insertions, 8 deletions
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 09333ae11..4f54f1a6a 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -4,16 +4,38 @@
</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 class="clear"></div>
+ </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 class="clear"></div>
</div>