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_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 4d8a744ac..4d18a080c 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
-	<span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span>
+	<span class="mail-list"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
-- 
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_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 4d18a080c..e6ddf3651 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,5 +1,5 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
-	<span class="mail-list"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
+	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
-- 
cgit v1.2.3


From 2d23fcfe5a150987a7ac079df0b2113b082f1fca Mon Sep 17 00:00:00 2001
From: marijus <mario@localhost.localdomain>
Date: Sun, 13 Oct 2013 22:24:33 +0200
Subject: reorder items in private-mail - the delete button is on the right
 side everywhere else...

---
 view/tpl/mail_list.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e6ddf3651..24966ad1d 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,8 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
-	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
 	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
+	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
+	<div class="clear">&nbsp;</div>
 </div>
-- 
cgit v1.2.3