aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/mail_conv.tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-26 13:28:24 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-26 13:28:24 -0700
commit15d1a6c9374a20379d98bfac729ecf10609a7759 (patch)
tree4cafe3c9d8f655880eaee3846d29ac157b6a9f1c /view/tpl/mail_conv.tpl
parent9ab335626cdaad433c8f5b6d7fd4d980c1b37742 (diff)
parent451db7dd98bcfb1525ee3dd0acfcd311b5615912 (diff)
downloadvolse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.tar.gz
volse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.tar.bz2
volse-hubzilla-15d1a6c9374a20379d98bfac729ecf10609a7759.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl/mail_conv.tpl')
-rwxr-xr-xview/tpl/mail_conv.tpl24
1 files changed, 12 insertions, 12 deletions
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index ec8f8c1e3..0a5e5a2c5 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,18 +1,18 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <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 class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+ <a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
</div>
- <div class="mail-conv-detail" >
+ <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-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+ <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
<div class="mail-conv-body">{{$mail.body}}</div>
- <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash 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="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><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 class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
+ {{if $mail.can_recall}}
+ <a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
+ {{/if}}
+ <a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
+ </div>
+ </div>
+ <div class="clear"></div>
</div>
-<hr class="mail-conv-break" />