Move group logo edit from object nav to block actions

This commit is contained in:
Evan Prodromou 2011-08-27 15:50:56 -04:00
parent 330af9991f
commit ffd387e2dd
2 changed files with 9 additions and 9 deletions

View File

@ -92,15 +92,6 @@ class GroupNav extends Menu
$action_name == 'groupqueue', $action_name == 'groupqueue',
'nav_group_pending'); '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)); Event::handle('EndGroupGroupNav', array($this));
} }

View File

@ -122,6 +122,15 @@ class GroupProfileBlock extends ProfileBlock
// TRANS: Link text for link on user profile. // TRANS: Link text for link on user profile.
_m('BUTTON','Edit')); _m('BUTTON','Edit'));
$this->out->elementEnd('li'); $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)) { if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
$this->out->elementStart('li', 'entity_delete'); $this->out->elementStart('li', 'entity_delete');