From c700a6fb37c7acc17a395a64dfaca5db275ff537 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 8 Nov 2015 18:02:04 +0100 Subject: [PATCH] duepuntozero, vier: add unread messages per group --- js/main.js | 7 +++++++ mod/ping.php | 26 +++++++++++++------------- view/templates/group_side.tpl | 9 +++++---- view/theme/duepuntozero/style.css | 11 +++++++++++ view/theme/quattro/js/quattro.js | 2 +- view/theme/vier/style.css | 17 ++++++++++++++--- 6 files changed, 51 insertions(+), 21 deletions(-) diff --git a/js/main.js b/js/main.js index 84940eb23..df454afe1 100644 --- a/js/main.js +++ b/js/main.js @@ -203,6 +203,13 @@ var birthdaystoday = $(data).find('birthdays-today').text(); if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') } + $(".sidebar-group-li .notify").removeClass("show"); + $(data).find("group").each(function() { + var gid = this.id; + var gcount = this.innerHTML; + $(".group-"+gid+" .notify").addClass("show").text(gcount); + }); + var eNotif = $(data).find('notif') diff --git a/mod/ping.php b/mod/ping.php index a7a2755c5..30b5785ae 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -203,8 +203,8 @@ function ping_init(&$a) { if ($a->is_friendica_app() OR !$regularnotifications) $n['message'] = str_replace("{0}", $n['name'], $n['message']); - $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); - + $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); + call_hooks('ping_xmlize', $n); $notsxml = '%s'."\n"; return sprintf ( $notsxml, @@ -250,41 +250,41 @@ function ping_init(&$a) { $n = array( 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], 'name' => $i['name'], - 'url' => $i['url'], + 'url' => $i['url'], 'photo' => $i['photo'], 'date' => $i['datetime'], 'seen' => false, - 'message' => t("{0} wants to be your friend"), + 'message' => t("{0} wants to be your friend"), ); $notifs[] = $n; } } - + if ($mail>0){ foreach ($mails as $i) { $n = array( 'href' => $a->get_baseurl().'/message/'.$i['id'], 'name' => $i['from-name'], - 'url' => $i['from-url'], + 'url' => $i['from-url'], 'photo' => $i['from-photo'], 'date' => $i['created'], 'seen' => false, - 'message' => t("{0} sent you a message"), + 'message' => t("{0} sent you a message"), ); $notifs[] = $n; } } - + if ($register>0){ foreach ($regs as $i) { $n = array( 'href' => $a->get_baseurl().'/admin/users/', 'name' => $i['name'], - 'url' => $i['url'], + 'url' => $i['url'], 'photo' => $i['micro'], 'date' => $i['created'], 'seen' => false, - 'message' => t("{0} requested registration"), + 'message' => t("{0} requested registration"), ); $notifs[] = $n; } @@ -363,7 +363,7 @@ function ping_get_notifications($uid) { $quit = true; else $offset += 50; - + foreach ($r AS $notification) { if (is_null($notification["visible"])) @@ -386,7 +386,7 @@ function ping_get_notifications($uid) { $notification["message"] = substr_replace($notification["message"],"{0}",$pos,strlen($notification["name"])); $notification['href'] = $a->get_baseurl() . '/notify/view/' . $notification['id']; - + if ($notification["visible"] AND !$notification["spam"] AND !$notification["deleted"] AND !is_array($result[$notification["parent"]])) { $result[$notification["parent"]] = $notification; @@ -395,6 +395,6 @@ function ping_get_notifications($uid) { } while ((count($result) < 50) AND !$quit); - + return($result); } diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl index c7e1aa895..4905c2fa1 100644 --- a/view/templates/group_side.tpl +++ b/view/templates/group_side.tpl @@ -4,18 +4,19 @@