mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 09:15:19 +00:00
Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
commit
3ae67c517e
4 changed files with 8 additions and 3 deletions
|
@ -213,7 +213,7 @@ function connections_content(&$a) {
|
|||
nav_set_selected('intros');
|
||||
break;
|
||||
case 'ifpending':
|
||||
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) and not (xchan_flags & %d )",
|
||||
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) and not ((abook_flags & %d) or (xchan_flags & %d))",
|
||||
intval(local_user()),
|
||||
intval(ABOOK_FLAG_PENDING),
|
||||
intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
|
||||
|
|
|
@ -81,6 +81,7 @@ function notifications_content(&$a) {
|
|||
);
|
||||
|
||||
if (count($r) > 0) {
|
||||
$notifications_available =1;
|
||||
foreach ($r as $it) {
|
||||
$notif_content .= replace_macros($not_tpl,array(
|
||||
'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
|
||||
|
@ -95,7 +96,9 @@ function notifications_content(&$a) {
|
|||
|
||||
$o .= replace_macros($notif_tpl,array(
|
||||
'$notif_header' => t('System Notifications'),
|
||||
'$notif_link_mark_seen' => t('Mark all system notifications seen'),
|
||||
'$notif_content' => $notif_content,
|
||||
'$notifications_available' => $notifications_available,
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
|
|
@ -1467,7 +1467,7 @@ div.jGrowl div.jGrowl-notification {
|
|||
|
||||
.autocomplete {
|
||||
color: $font_colour;
|
||||
background: #FFF;
|
||||
background: $dropdown_bgcolour;
|
||||
cursor: pointer;
|
||||
text-align: left;
|
||||
max-height: 350px;
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
<h1>{{$notif_header}}</h1>
|
||||
|
||||
{{if $notifications_available}}
|
||||
<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a>
|
||||
{{/if}}
|
||||
<div class="notif-network-wrapper">
|
||||
{{$notif_content}}
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue