diff options
| author | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-29 12:40:24 +0200 |
| commit | f950d27b3debfe08e022a477dbfb4fac101106e4 (patch) | |
| tree | 38f62f0828163715c634e17290e2d77eb29d1b32 /view/tpl/mail_conv.tpl | |
| parent | 8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (diff) | |
| parent | 2a2da48d1871f408232a8397632f06528c8b43ae (diff) | |
| download | volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.gz volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.bz2 volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/mail_conv.tpl')
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index ec8f8c1e3..2e64de7bc 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,18 +1,18 @@ -<div class="mail-conv-outside-wrapper"> +<div id="mail-{{$mail.id}}" 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/{{$mail.mailbox}}/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="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" 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" /> |