harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show the right conversation active and do not show any conversation active if we compose a new one

Browse Source
This commit is contained in:
git-marijus 2017-07-22 12:46:02 +02:00
parent 363d872326
commit 16067db718
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Widget/Conversations.php
View File

@ -40,6 +40,8 @@ class Conversations {
foreach($r as $rr) { foreach($r as $rr) {
$selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']);
$messages[] = array( $messages[] = array(
'mailbox' => $mailbox, 'mailbox' => $mailbox,
'id' => $rr['id'], 'id' => $rr['id'],
@ -54,7 +56,7 @@ class Conversations {
'body' => $rr['body'], 'body' => $rr['body'],
'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'), 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
'seen' => $rr['seen'], 'seen' => $rr['seen'],
'selected' => ((argc() == 2) ? (intval(argv(1)) == intval($rr['id'])) : ($r[0]['id'] == $rr['id'])) 'selected' => ((argv(1) != 'new') ? $selected : '')
); );
} }

2
view/tpl/mail_list.tpl
View File

@ -1,6 +1,6 @@
<li class="nav-item"> <li class="nav-item">
<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}"> <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> <span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br>
<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>
</a> </a>