Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts

[friendica.git] / view / mail_conv.tpl

diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
index 6c2af115bb54b78751cb6effceebb8870d2557f6..75a4506f6a36119950c9b7800c7184592317b4c1 100644 (file)
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
@@ -1,13 +1,13 @@
 <div class="mail-conv-outside-wrapper">
        <div class="mail-conv-sender" >
-               <a href="$from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$sparkle" src="$from_photo" alt="$from_name" /></a>
+               <a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
        </div>
        <div class="mail-conv-detail" >
-               <div class="mail-conv-sender-name" >$from_name</div>
-               <div class="mail-conv-date">$date</div>
-               <div class="mail-conv-subject">$subject</div>
-               <div class="mail-conv-body">$body</div>
-       <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$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-sender-name" >$mail.from_name</div>
+               <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-outside-wrapper-end"></div>
 </div>
 </div>