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

more notifications fixes

Browse Source 
(cherry picked from commit 9ef6c57ca5)
This commit is contained in:
Mario Vavti
2018-12-03 09:46:49 +00:00
committed by Mario
parent 2173ef5fb6
commit c50e3a702a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Widget/Notifications.php
View File

@@ -24,7 +24,7 @@ class Notifications {
], ],
'filter' => [ 'filter' => [
'posts_label' => t('Show new posts only'), 'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name') 'name_label' => t('Filter by name or address')
] ]
]; ];
@@ -43,7 +43,7 @@ class Notifications {
], ],
'filter' => [ 'filter' => [
'posts_label' => t('Show new posts only'), 'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name') 'name_label' => t('Filter by name or address')
] ]
]; ];
@@ -119,7 +119,7 @@ class Notifications {
'label' => t('Forums'), 'label' => t('Forums'),
'title' => t('Forums'), 'title' => t('Forums'),
'filter' => [ 'filter' => [
'name_label' => t('Filter by name') 'name_label' => t('Filter by name or address')
] ]
]; ];
} }
@@ -150,7 +150,7 @@ class Notifications {
], ],
'filter' => [ 'filter' => [
'posts_label' => t('Show new posts only'), 'posts_label' => t('Show new posts only'),
'name_label' => t('Filter by name') 'name_label' => t('Filter by name or address')
] ]
]; ];
} }

2
include/text.php
View File

@@ -3421,7 +3421,7 @@ function get_forum_channels($uid) {
$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 ");
$r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name", $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name",
intval($uid) intval($uid)
); );

2
view/tpl/notifications_widget.tpl
View File

@@ -142,7 +142,7 @@
</a> </a>
</div> </div>
<div id="nav-notifications-forums-template" rel="template"> <div id="nav-notifications-forums-template" rel="template">
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}"> <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
<span class="float-right badge badge-{{$notification.severity}}">{10}</span> <span class="float-right badge badge-{{$notification.severity}}">{10}</span>
<img class="menu-img-1" data-src="{1}"> <img class="menu-img-1" data-src="{1}">
<span class="">{2}</span> <span class="">{2}</span>