From 1e12760590a763ec2af5988080b6a94b21a17f1a Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 25 Jun 2011 12:04:58 -0400 Subject: updates the avatar update river view and closes pull request #48 --- views/default/river/user/default/profileiconupdate.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'views/default/river/user') diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php index a723c5335..3237d7aad 100644 --- a/views/default/river/user/default/profileiconupdate.php +++ b/views/default/river/user/default/profileiconupdate.php @@ -2,12 +2,12 @@ /** * Update avatar river view */ -$subject = $vars['item']->getSubjectEntity(); -$subject_icon = elgg_view_entity_icon($subject, 'tiny'); -echo elgg_echo("profile:river:iconupdate"); +$subject = $vars['item']->getSubjectEntity(); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view_entity_icon($subject, 'tiny'), +)); -echo '
'; -echo $subject_icon; -echo '
'; -- cgit v1.2.3 From 5df3bcf4151d6731c32d71f758d7922d0c1c4932 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 25 Jun 2011 12:10:33 -0400 Subject: actually read Evan's comment on pull request #48 and fixed previous --- languages/en.php | 2 +- views/default/river/user/default/profileiconupdate.php | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'views/default/river/user') diff --git a/languages/en.php b/languages/en.php index eaf7f9084..50cd08ac9 100644 --- a/languages/en.php +++ b/languages/en.php @@ -404,7 +404,7 @@ $english = array( */ 'river' => "River", 'river:friend:user:default' => "%s is now a friend with %s", - 'river:update:user:default' => '%s has a new avatar', + 'river:update:user:avatar' => '%s has a new avatar', 'river:noaccess' => 'You do not have permission to view this item.', 'river:posted:generic' => '%s posted', 'riveritem:single:user' => 'a user', diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php index 3237d7aad..c7f691533 100644 --- a/views/default/river/user/default/profileiconupdate.php +++ b/views/default/river/user/default/profileiconupdate.php @@ -6,8 +6,16 @@ $subject = $vars['item']->getSubjectEntity(); +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', +)); + +$string = elgg_echo('river:update:user:avatar', array($subject_link)); + echo elgg_view('river/item', array( 'item' => $vars['item'], + 'summary' => $string, 'attachments' => elgg_view_entity_icon($subject, 'tiny'), )); - -- cgit v1.2.3