diff --git a/include/datetime.php b/include/datetime.php index 8ac8ff0f29..6461298ba2 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -262,10 +262,12 @@ function relative_date($posted_date,$format = null) { return t('less than a second ago'); } + /* $time_append = ''; if ($etime >= 86400) { $time_append = ' ('.$localtime.')'; } + */ $a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')), 30 * 24 * 60 * 60 => array( t('month'), t('months')), @@ -283,7 +285,7 @@ function relative_date($posted_date,$format = null) { // translators - e.g. 22 hours ago, 1 minute ago if(! $format) $format = t('%1$d %2$s ago'); - return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])).$time_append; + return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])); } } }} diff --git a/js/main.js b/js/main.js index 25029c1b05..239a875cb4 100644 --- a/js/main.js +++ b/js/main.js @@ -75,14 +75,14 @@ setupFieldRichtext(); /* popup menus */ - function close_last_popup_menu() { - if(last_popup_menu) { - last_popup_menu.hide(); - last_popup_button.removeClass("selected"); - last_popup_menu = null; - last_popup_button = null; - } - } + function close_last_popup_menu() { + if(last_popup_menu) { + last_popup_menu.hide(); + last_popup_button.removeClass("selected"); + last_popup_menu = null; + last_popup_button = null; + } + } $('a[rel^=#]').click(function(e){ e.preventDefault(); var parent = $(this).parent(); @@ -105,7 +105,7 @@ return false; }); $('html').click(function() { - close_last_popup_menu(); + close_last_popup_menu(); }); // fancyboxes @@ -181,24 +181,41 @@ nnm = $("#nav-notifications-menu"); nnm.html(notifications_all + notifications_mark); //nnm.attr('popup','true'); + + var notification_lastitem = parseInt(localStorage.getItem("notification-lastitem")); + var notification_id = 0; eNotif.children("note").each(function(){ e = $(this); - text = e.text().format(""+e.attr('name')+""); - html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); + var text = e.text().format(""+e.attr('name')+""); + var seenclass = (e.attr('seen')==1)?"notify-seen":"notify-unseen"; + var html = notifications_tpl.format(e.attr('href'), + e.attr('photo'), // {0} + text, // {1} + e.attr('date'), // {2} + seenclass, // {3} + new Date(e.attr('timestamp')*1000) // {4} + ); nnm.append(html); - - if(e.text().search('→') == 0) { - var notification = new Notification(document.title, { - body: e.text().replace('→ ',''), - icon: e.attr('photo') - }); - - // TODO (yet unsupported by most browsers): - // Implement notification.onclick() - - // notifyMarkAll(); - } }); + $(eNotif.children("note").get().reverse()).each(function(){ + e = $(this); + notification_id = parseInt(e.attr('timestamp')); + if (notification_lastitem!== null && notification_id > notification_lastitem) { + if (getNotificationPermission()==="granted") { + var notification = new Notification(document.title, { + body: e.text().replace('→ ','').format(e.attr('name')), + icon: e.attr('photo'), + }); + notification['url'] = e.attr('href'); + notification.addEventListener("click", function(ev){ + window.location = ev.target.url; + }); + } + } + + }); + notification_lastitem = notification_id; + localStorage.setItem("notification-lastitem", notification_lastitem) $("img[data-src]", nnm).each(function(i, el){ // Add src attribute for images with a data-src attribute @@ -762,3 +779,18 @@ function previewTheme(elm) { }); } + +// notification permission settings in localstorage +// set by settings page +function getNotificationPermission() { + if (window["Notification"] === undefined) { + return null; + } + if (Notification.permission === 'granted') { + var val = localStorage.getItem('notification-permissions'); + if (val === null) return 'denied'; + return val; + } else { + return Notification.permission; + } +} diff --git a/mod/ping.php b/mod/ping.php index 97a3070d84..e87ed98553 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -1,7 +1,7 @@ notification link + * 'name' => subject name + * 'url' => subject url + * 'photo' => subject photo + * 'date' => notification date + * 'seen' => bool true/false + * 'message' => notification message. "{0}" will be replaced by subject name + **/ + function xmlize($n){ + $n['photo'] = proxy_url($n['photo']); - function xmlize($href, $name, $url, $photo, $date, $seen, $message){ - require_once("mod/proxy.php"); - $photo = proxy_url($photo); - - $message = html_entity_decode($message, ENT_COMPAT | ENT_HTML401, "UTF-8"); - $name = html_entity_decode($name, ENT_COMPAT | ENT_HTML401, "UTF-8"); + $n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8"); + $n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8"); // Are the nofications calles from the regular process or via the friendica app? $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_'])); @@ -176,13 +184,16 @@ function ping_init(&$a) { $a = get_app(); if ($a->is_friendica_app() OR !$regularnotifications) - $message = str_replace("{0}", $name, $message); + $n['message'] = str_replace("{0}", $n['name'], $n['message']); - $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message); - call_hooks('ping_xmlize', $data); - $notsxml = '%s'."\n"; + $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); + + call_hooks('ping_xmlize', $n); + $notsxml = '%s'."\n"; return sprintf ( $notsxml, - xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message) + xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']), + xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)), + xmlify($n['message']) ); } @@ -199,98 +210,78 @@ function ping_init(&$a) { $birthdays $birthdays_today\r\n"; - $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); - if($firehose) { - echo ' '; - } - else { - if(count($z) && (! $sysnotify)) { - foreach($z as $zz) { - if($zz['seen'] == 0) - $sysnotify ++; - } - } - - echo ' '; - - if ($intro>0){ - foreach ($intros as $i) { - echo xmlize($a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen', "→ ".t("{0} wants to be your friend")); - }; - } - if ($mail>0){ - foreach ($mails as $i) { - echo xmlize($a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',"→ ".t("{0} sent you a message")); - }; - } - if ($register>0){ - foreach ($regs as $i) { - echo xmlize($a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen', "→ ".t("{0} requested registration")); - }; - } - - if(count($z)) { - foreach($z as $zz) { - echo xmlize($a->get_baseurl() . '/notify/view/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), ($zz['seen'] ? 'notify-seen' : 'notify-unseen'), ($zz['seen'] ? '' : '→ ') .strip_tags(bbcode($zz['msg']))); - } + if(count($notifs) && (! $sysnotify)) { + foreach($notifs as $zz) { + if($zz['seen'] == 0) + $sysnotify ++; } } - if($firehose) { - if ($intro>0){ - foreach ($intros as $i) { - echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), 'notify-unseen',t("{0} wants to be your friend") ); - }; - } - if ($mail>0){ - foreach ($mails as $i) { - echo xmlize( $a->get_baseurl().'/message/'.$i['id'], $i['from-name'], $i['from-url'], $i['from-photo'], relative_date($i['created']), 'notify-unseen',t("{0} sent you a message") ); - }; - } - if ($register>0){ - foreach ($regs as $i) { - echo xmlize( $a->get_baseurl().'/admin/users/', $i['name'], $i['url'], $i['micro'], relative_date($i['created']), 'notify-unseen',t("{0} requested registration") ); - }; - } + echo ' '; - if (count($comments)){ - foreach ($comments as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} commented %s's post"), $i['pname'] ) ); - }; - } - if (count($likes)){ - foreach ($likes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} liked %s's post"), $i['pname'] ) ); - }; - } - if (count($dislikes)){ - foreach ($dislikes as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} disliked %s's post"), $i['pname'] ) ); - }; - } - if (count($friends)){ - foreach ($friends as $i) { - echo xmlize($a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'],$i['author-name'],$i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} is now friends with %s"), $i['fname'] ) ); - }; - } - if (count($posts)){ - foreach ($posts as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} posted") ) ); - }; - } - if (count($tags)){ - foreach ($tags as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) ); - }; - } - - if (count($cit)){ - foreach ($cit as $i) { - echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), 'notify-unseen',t("{0} mentioned you in a post") ); - }; + // merge all notification types in one array + if ($intro>0){ + foreach ($intros as $i) { + $n = array( + 'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'], + 'name' => $i['name'], + 'url' => $i['url'], + 'photo' => $i['photo'], + 'date' => $i['datetime'], + 'seen' => false, + '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'], + 'photo' => $i['from-photo'], + 'date' => $i['created'], + 'seen' => false, + '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'], + 'photo' => $i['micro'], + 'date' => $i['created'], + 'seen' => false, + 'message' => t("{0} requested registration"), + ); + $notifs[] = $n; + } + } + // sort notifications by $[]['date'] + $sort_function = function($a, $b) { + $adate = date($a['date']); + $bdate = date($b['date']); + if ($adate == $bdate) { + return 0; + } + return ($adate < $bdate) ? 1 : -1; + }; + usort($notifs, $sort_function); + + if(count($notifs)) { + foreach($notifs as $n) { + echo xmlize($n); + } + } + echo " "; } @@ -322,7 +313,7 @@ function ping_get_notifications($uid) { $offset = 0; $seen = false; $seensql = "NOT"; - $order = ""; + $order = "DESC"; $quit = false; $a = get_app(); @@ -348,6 +339,7 @@ function ping_get_notifications($uid) { $quit = true; else $offset += 50; + foreach ($r AS $notification) { if (is_null($notification["visible"])) @@ -359,22 +351,26 @@ function ping_get_notifications($uid) { if (is_null($notification["deleted"])) $notification["deleted"] = 0; - $notification["msg"] = strip_tags(bbcode($notification["msg"])); + $notification["message"] = strip_tags(bbcode($notification["msg"])); $notification["name"] = strip_tags(bbcode($notification["name"])); // Replace the name with {0} but ensure to make that only once // The {0} is used later and prints the name in bold. - $pos = strpos($notification["msg"],$notification['name']); + $pos = strpos($notification["message"],$notification['name']); if ($pos !== false) - $notification["msg"] = substr_replace($notification["msg"],"{0}",$pos,strlen($notification["name"])); + $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"]])) + !$notification["deleted"] AND !is_array($result[$notification["parent"]])) { $result[$notification["parent"]] = $notification; + } } } while ((count($result) < 50) AND !$quit); + return($result); } diff --git a/mod/settings.php b/mod/settings.php index a003401dff..9d2e287157 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1207,9 +1207,7 @@ function settings_content(&$a) { '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''), '$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''), - '$desktop_notifications' => t('Activate desktop notifications'), - '$desktop_notifications_note' => t('Note: This is an experimental feature, as being not supported by each browser'), - '$desktop_notifications_success_message' => t('You will now receive desktop notifications!'), + '$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')), '$email_textonly' => array('email_textonly', t('Text-only notification emails'), get_pconfig(local_user(),'system','email_textonly'), diff --git a/view/global.css b/view/global.css index 0ce3855c58..9bcd302296 100644 --- a/view/global.css +++ b/view/global.css @@ -169,3 +169,11 @@ h6 { span.oembed, h4 { margin: 0px 0px 0px 0px; } + +/* fields help text */ +.field .field_help { + clear: left; +} + +/* notifications unseen */ +.notify-unseen { background-color: #cceeFF; } \ No newline at end of file diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl index 3a54066ad1..02fe6da3b9 100644 --- a/view/templates/nav.tpl +++ b/view/templates/nav.tpl @@ -65,5 +65,5 @@ diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl index 95ee0f6fbc..26c44f91c3 100644 --- a/view/templates/settings.tpl +++ b/view/templates/settings.tpl @@ -133,12 +133,61 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} +{{include file="field_checkbox.tpl" field=$email_textonly}} + + + +{{include file="field_yesno.tpl" field=$desktop_notifications}} + diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl index 3e821a31c3..8149ef374c 100644 --- a/view/theme/duepuntozero/templates/nav.tpl +++ b/view/theme/duepuntozero/templates/nav.tpl @@ -67,5 +67,5 @@ diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 865e9b5f5e..7a335ff4bc 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -514,6 +514,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -846,6 +847,7 @@ aside .posted-date-selector-months { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -927,6 +929,7 @@ aside .posted-date-selector-months { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1208,6 +1211,7 @@ section { height: 32px; margin-left: 16px; /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + } .comment-edit-preview .contact-photo-menu-button { top: 15px !important; @@ -2077,6 +2081,7 @@ ul.tabs li .active { min-height: 22px; padding-top: 6px; /* a { display: block;}*/ + } #photo-caption { display: block; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 7a9326c671..0fdbbbbbd0 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -514,6 +514,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -846,6 +847,7 @@ aside .posted-date-selector-months { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -927,6 +929,7 @@ aside .posted-date-selector-months { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1208,6 +1211,7 @@ section { height: 32px; margin-left: 16px; /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + } .comment-edit-preview .contact-photo-menu-button { top: 15px !important; @@ -2077,6 +2081,7 @@ ul.tabs li .active { min-height: 22px; padding-top: 6px; /* a { display: block;}*/ + } #photo-caption { display: block; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index baaa44c0a3..7a0f7e537e 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -514,6 +514,7 @@ header { margin: 0px; padding: 0px; /*width: 100%; height: 12px; */ + z-index: 110; color: #ffffff; } @@ -846,6 +847,7 @@ aside .posted-date-selector-months { overflow: auto; height: auto; /*.contact-block-div { width:60px; height: 60px; }*/ + } #contact-block .contact-block-h4 { float: left; @@ -927,6 +929,7 @@ aside .posted-date-selector-months { margin-bottom: 2em; /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + } .widget h3 { padding: 0px; @@ -1208,6 +1211,7 @@ section { height: 32px; margin-left: 16px; /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + } .comment-edit-preview .contact-photo-menu-button { top: 15px !important; @@ -2077,6 +2081,7 @@ ul.tabs li .active { min-height: 22px; padding-top: 6px; /* a { display: block;}*/ + } #photo-caption { display: block; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index f29e38fb0e..142bdc190a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1197,7 +1197,6 @@ ul.tabs { display: block; margin-left: 200px; color: @FieldHelpColor; - } diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl index 2c646306ad..e0c7ba8e3b 100644 --- a/view/theme/quattro/templates/nav.tpl +++ b/view/theme/quattro/templates/nav.tpl @@ -109,7 +109,7 @@
{{$langselector}}
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index ec1be842c6..26b34073a6 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -97,44 +97,8 @@ -{{* - -{{if $nav.logout}}{{$nav.logout.1}} {{/if}} -{{if $nav.login}} {{/if}} - - - -{{if $nav.register}}{{$nav.register.1}}{{/if}} - -{{$nav.help.1}} - -{{if $nav.apps}}{{$nav.apps.1}}{{/if}} - -{{$nav.search.1}} -{{$nav.directory.1}} - -{{if $nav.admin}}{{$nav.admin.1}}{{/if}} - -{{if $nav.notifications}} -{{$nav.notifications.1}} - -{{/if}} -{{if $nav.messages}} -{{$nav.messages.1}} - -{{/if}} - -{{if $nav.manage}}{{$nav.manage.1}}{{/if}} -{{if $nav.settings}}{{$nav.settings.1}}{{/if}} -{{if $nav.profiles}}{{$nav.profiles.1}}{{/if}} - - - - - -*}}