diff options
| -rwxr-xr-x | include/enotify.php | 6 | ||||
| -rw-r--r-- | mod/ping.php | 25 | ||||
| -rwxr-xr-x | view/theme/testbubble/nav.tpl | 3 | ||||
| -rwxr-xr-x | view/theme/testbubble/style.css | 4 |
4 files changed, 34 insertions, 4 deletions
diff --git a/include/enotify.php b/include/enotify.php index 7fa83cfa4..6af2243f0 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -30,9 +30,9 @@ function notification($params) { $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename); $epreamble = sprintf( t('%s sent you %s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); - $tsitelink = sprintf( $sitelink, $siteurl . '/message' ); - $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message">' . $sitename . '</a>'); - $itemlink = $siteurl . '/message'; + $tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] ); + $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message/' . $params['item']['id'] . '">' . $sitename . '</a>'); + $itemlink = $siteurl . '/message/' . $params['item']['id']; } if($params['type'] == NOTIFY_COMMENT) { diff --git a/mod/ping.php b/mod/ping.php index 9c2e385d6..2898042a3 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -12,6 +12,13 @@ function ping_init(&$a) { $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; if(local_user()){ + $z = q("select * from notify where seen = 0 and uid = %d + order by date desc", + intval(local_user()) + ); + + + $tags = array(); $comments = array(); $likes = array(); @@ -142,6 +149,22 @@ function ping_init(&$a) { $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); echo ' <notif count="'.$tot.'">'; + + require_once('include/bbcode.php'); + + if(count($z)) { + foreach($z as $zz) { + echo xmlize($a->get_baseurl() . '/notify/' . $zz['id'], $zz['name'],$zz['url'],$zz['photo'],relative_date($zz['date']), bbcode($zz['msg'])); + + } + } + + + + + +/* + 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']), t("{0} wants to be your friend") ); @@ -195,6 +218,8 @@ function ping_init(&$a) { }; } +*/ + echo " </notif>"; } echo " <sysmsgs>"; diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index acbea5bf8..9051fcb06 100755 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -6,7 +6,8 @@ <div id="notifications"> {{ if $nav.network }}<a rel="#nav-notifications-menu" id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }} {{ if $nav.home }}<a rel="#nav-notifications-menu" id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }} - {{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} +<!-- {{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} --> + {{ if $nav.introductions }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }} {{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }} <ul id="nav-notifications-menu" class="menu-popup"> <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index fcb7bea7a..c6f66d5ad 100755 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -3202,6 +3202,10 @@ ul.menu-popup { background-color:#b20202; } +#nav-notifications-menu a:hover { + text-decoration: underline; +} + .notif-item a { vertical-align: middle; color: #626262; |