Move group logo edit from object nav to block actions

diff --git a/lib/groupnav.php b/lib/groupnav.php
index 50e29d40b612c26e11dae74013cf6fe0240e172f..aadc8f80418b5d21ba8f970cd7abc48066daa097 100644 (file)
--- 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 258a2f792ee36be7bc0510e40b5e948d780f4a28..9372a786808bbeba36273b83a3d5c6cadd3b1390 100644 (file)
--- 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');