aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/mail_display.tpl
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-30 12:21:36 +0200
commite07ff7d3fbb9bef720831dc71470b70a882abfdf (patch)
tree68934f0deb2fb9edef69954d1016734bc8662957 /view/tpl/mail_display.tpl
parentb22fa9f7f4b77569c29b0fc881373393281b7bf4 (diff)
parente769fbaffb09aa673d7475c598e7df7e7978d210 (diff)
downloadvolse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.gz
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.tar.bz2
volse-hubzilla-e07ff7d3fbb9bef720831dc71470b70a882abfdf.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/mail_display.tpl')
-rwxr-xr-xview/tpl/mail_display.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index bb89c96ec..789c25ade 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,8 +1,8 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a class="btn btn-xs btn-danger pull-right" href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
+ <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>
<h2>{{$prvmsg_header}}</h2>
-
+ <div class="clear"></div>
</div>
<div class="section-content-wrapper">
{{foreach $mails as $mail}}