diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 12:30:13 -0400 |
| commit | e7b920c273efd8c6a70b90f701bd14f5c632d38f (patch) | |
| tree | 1b1aeb8b50a56774dc66ad68765f3462b91b5403 /view/mail_conv.tpl | |
| parent | f2e2632810ad3ac465edcf4cf80e1dc89e995c82 (diff) | |
| parent | e935b3a2253e2c1078ebecb7b9784029c94fb344 (diff) | |
| download | volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.gz volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.tar.bz2 volse-hubzilla-e7b920c273efd8c6a70b90f701bd14f5c632d38f.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* 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> |