Merge pull request #23 from duthied/master

+posts to the notifications page
This commit is contained in:
duthied 2011-10-08 20:52:31 -07:00
commit 0963470404
2 changed files with 15 additions and 3 deletions

View file

@ -191,6 +191,7 @@ function notifications_content(&$a) {
$tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
$tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); $tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
$tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); $tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
$tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
$notif_content = ''; $notif_content = '';
@ -205,8 +206,8 @@ function notifications_content(&$a) {
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created']) '$item_when' => relative_date($it['created'])
)); ));
break; break;
case ACTIVITY_DISLIKE: case ACTIVITY_DISLIKE:
$notif_content .= replace_macros($tpl_item_dislikes,array( $notif_content .= replace_macros($tpl_item_dislikes,array(
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
@ -214,8 +215,8 @@ function notifications_content(&$a) {
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created']) '$item_when' => relative_date($it['created'])
)); ));
break; break;
case ACTIVITY_FRIEND: case ACTIVITY_FRIEND:
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
@ -228,8 +229,16 @@ function notifications_content(&$a) {
'$item_text' => sprintf( t("%s is now friend with %s"), $it['author-name'], $it['fname']), '$item_text' => sprintf( t("%s is now friend with %s"), $it['author-name'], $it['fname']),
'$item_when' => relative_date($it['created']) '$item_when' => relative_date($it['created'])
)); ));
break; break;
case ACTIVITY_POST;$notif_content .= replace_macros($tpl_item_posts,array(
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s posted"), $it['author-name']),
'$item_when' => relative_date($it['created'])
));
break;
default: default:
$notif_content .= replace_macros($tpl_item_comments,array( $notif_content .= replace_macros($tpl_item_comments,array(
'$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'], '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],

View file

@ -0,0 +1,3 @@
<div class="notif-item">
<a href="$item_link"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
</div>