diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-01 14:11:37 +0200 |
| commit | 7d23149a61f75923b2c71a288a722ee219f5e6ba (patch) | |
| tree | dea64e1cfc15eb6f95e7440e532258dfb909c21c /view/mail_conv.tpl | |
| parent | 59b45f7fc12027c387f04a2121ea398c1d534626 (diff) | |
| parent | bb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff) | |
| download | volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2 volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/mail_conv.tpl')
| -rwxr-xr-x | view/mail_conv.tpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl index ed36a7bb2..75a4506f6 100755 --- 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" heigth="80" width="80" 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" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" 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> |