js to open close popup nav menu and to populate notification menu via ping.

Update mod/ping to return details about messages and intros
This commit is contained in:
Fabio Comuni 2011-07-25 16:54:39 +02:00
parent 5fb2b522f4
commit 99ab06bad3
2 changed files with 71 additions and 27 deletions

View File

@ -34,6 +34,9 @@
msie = $.browser.msie ; msie = $.browser.msie ;
/* setup navbar menus */
/* setup onoff widgets */ /* setup onoff widgets */
$(".onoff input").each(function(){ $(".onoff input").each(function(){
@ -55,34 +58,46 @@
/* setup field_richtext */ /* setup field_richtext */
setupFieldRichtext(); setupFieldRichtext();
/* load tinyMCE if needed and setup field_richtext */ /* popup menus */
/*if(typeof tinyMCE == "undefined") { $('a[rel^=#]').click(function(e){
window.tinyMCEPreInit = { e.stopPropagation();
suffix:"", menu = $( $(this).attr('rel') );
base: baseurl+"/library/tinymce/jscripts/tiny_mce/", $(this).parent().toggleClass("selected");
query:"", menu.toggle();
}; return false;
$.getScript(baseurl +"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", setupFieldRichtext); });
} else {
}*/
/* notifications template */
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
/* nav update event */ /* nav update event */
$('nav').bind('nav-update', function(e,data){; $('nav').bind('nav-update', function(e,data){;
var net = $(data).find('net').text(); var net = $(data).find('net').text();
if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() } if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
$('#net-update').html(net); $('#net-update').html(net);
var home = $(data).find('home').text(); var home = $(data).find('home').text();
if(home == 0) { home = ''; $('#home-update').hide() } else { $('#home-update').show() } if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$('#home-update').html(home); $('#home-update').html(home);
var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $('#mail-update').hide() } else { $('#mail-update').show() } var eNotif = $(data).find('notif')
$('#mail-update').html(mail); notif = eNotif.attr('count');
var intro = $(data).find('intro').text(); if (notif>0){
if(intro == 0) { intro = ''; $('#notify-update').hide() } else { $('#notify-update').show() } nnm = $("#nav-notifications-menu");
$('#notify-update').html(intro); nnm.html("");
eNotif.children("note").each(function(){
e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
nnm.append(html);
});
}
if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
$('#notify-update').html(notif);
}); });

View File

@ -1,5 +1,5 @@
<?php <?php
require_once("include/datetime.php");
function ping_init(&$a) { function ping_init(&$a) {
@ -7,6 +7,7 @@ function ping_init(&$a) {
if(! local_user()) if(! local_user())
xml_status(0); xml_status(0);
$r = q("SELECT COUNT(*) AS `total` FROM `item` $r = q("SELECT COUNT(*) AS `total` FROM `item`
WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ", WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ",
intval(local_user()) intval(local_user())
@ -19,23 +20,51 @@ function ping_init(&$a) {
); );
$home = $r[0]['total']; $home = $r[0]['total'];
$r = q("SELECT COUNT(*) AS `total` FROM `intro` $intros = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`,
WHERE `uid` = %d AND `blocked` = 0 AND `ignore` = 0 ", `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 ",
intval(local_user()) intval(local_user())
); );
$intro = $r[0]['total']; $intro = $intros[0]['total'];
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ; $myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$r = q("SELECT COUNT(*) AS `total` FROM `mail` $mails = q("SELECT *, COUNT(*) AS `total` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
intval(local_user()), intval(local_user()),
dbesc($myurl) dbesc($myurl)
); );
$mail = $mails[0]['total'];
$mail = $r[0]['total'];
header("Content-type: text/xml"); header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n"; echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
<result>
<intro>$intro</intro>
<mail>$mail</mail>
<net>$network</net>
<home>$home</home>
<notif count=\"".($mail+$intro)."\">";
if ($intro>0){
foreach ($intros as $i) {
echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
$a->get_baseurl().'/notification/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend")
);
};
}
if ($mail>0){
foreach ($mails as $i) {
var_dump($i);
echo sprintf ('<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>',
$a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), t("{0} sent you a message")
);
};
}
echo " </notif>
</result>
";
killme(); killme();
} }