From ffd387e2dd42b40b5bae079e493774a38d66e963 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 27 Aug 2011 15:50:56 -0400 Subject: [PATCH] Move group logo edit from object nav to block actions --- lib/groupnav.php | 9 --------- lib/groupprofileblock.php | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/groupnav.php b/lib/groupnav.php index 50e29d40b6..aadc8f8041 100644 --- a/lib/groupnav.php +++ b/lib/groupnav.php @@ -92,15 +92,6 @@ class GroupNav extends Menu $action_name == 'groupqueue', 'nav_group_pending'); } - $this->out->menuItem(common_local_url('grouplogo', array('nickname' => - $nickname)), - // TRANS: Menu item in the group navigation page. Only shown for group administrators. - _m('MENU','Logo'), - // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. - // TRANS: %s is the nickname of the group. - sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname), - $action_name == 'grouplogo', - 'nav_group_logo'); } Event::handle('EndGroupGroupNav', array($this)); } diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php index 258a2f792e..9372a78680 100644 --- a/lib/groupprofileblock.php +++ b/lib/groupprofileblock.php @@ -122,6 +122,15 @@ class GroupProfileBlock extends ProfileBlock // TRANS: Link text for link on user profile. _m('BUTTON','Edit')); $this->out->elementEnd('li'); + $this->out->elementStart('li', 'entity_edit'); + $this->out->element('a', array('href' => common_local_url('grouplogo', + array('nickname' => $this->group->nickname)), + // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. + // TRANS: %s is the nickname of the group. + 'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname)), + // TRANS: Link text for link on user profile. + _m('MENU','Logo')); + $this->out->elementEnd('li'); } if ($cur && $cur->hasRight(Right::DELETEGROUP)) { $this->out->elementStart('li', 'entity_delete');