From 7e850e0687ed30231bd185e8a19776a11a74d2a8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 11 Oct 2013 22:30:11 -0700
Subject: more icons

---
 view/tpl/mail_conv.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/mail_conv.tpl')

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index bfa9491f4..d25919b39 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -7,7 +7,7 @@
 		<div class="mail-conv-date">{{$mail.date}}</div>
 		<div class="mail-conv-subject">{{$mail.subject}}</div>
 		<div class="mail-conv-body">{{$mail.body}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
-- 
cgit v1.2.3


From 1c8a36f9ca1f1cfd4cab47b47c855b530467593d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 11 Oct 2013 23:12:10 -0700
Subject: mail recall

---
 view/tpl/mail_conv.tpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'view/tpl/mail_conv.tpl')

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index d25919b39..84bdb451a 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -4,10 +4,14 @@
 		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
 	</div>
 	<div class="mail-conv-detail" >
+		{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
 		<div class="mail-conv-date">{{$mail.date}}</div>
 		<div class="mail-conv-subject">{{$mail.subject}}</div>
 		<div class="mail-conv-body">{{$mail.body}}</div>
 	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
+	{{if $mail.can_recall}}
+	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
+	{{/if}}
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
-- 
cgit v1.2.3