diff options
author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /view/tpl/mail_list.tpl | |
parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'view/tpl/mail_list.tpl')
-rwxr-xr-x | view/tpl/mail_list.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 24966ad1d..c96827996 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper" id="mail-list-wrapper"> <a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <span class="mail-list">{{$from_name}}</span> - <span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> + <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" title="{{$date}}">{{$date}}</span> <span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span> <div class="clear"> </div> |