aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/mail_display.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_display.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_display.tpl')
-rwxr-xr-xview/tpl/mail_display.tpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index 789c25ade..24e763571 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,6 +1,8 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
+ {{if $mailbox == 'combined'}}
<a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
+ {{/if}}
<h2>{{$prvmsg_header}}</h2>
<div class="clear"></div>
</div>