Add tabset to group and admin tabs

diff --git a/actions/editgroup.php b/actions/editgroup.php
index 5f853a089492c94afe925bfb5642a75389c02b18..e0d4c0d036868965944470002c12facee644db4d 100644 (file)
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -96,6 +96,8 @@ class EditgroupAction extends Action
             $this->clientError(_('No such group'), 404);
             return false;
         }
+
+        return true;
     }
 
     /**
@@ -124,6 +126,12 @@ class EditgroupAction extends Action
         $this->showPage();
     }
 
+    function showLocalNav()
+    {
+        $nav = new GroupNav($this, $this->group);
+        $nav->show();
+    }
+
     function showContent()
     {
         $form = new GroupEditForm($this, $this->group);

diff --git a/actions/showgroup.php b/actions/showgroup.php
index f404c648d723f2ac938116938c54dc3dabaa4f5b..5c72996bfab1c9fe758da1db0e72ab29a342e7a5 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -144,6 +144,12 @@ class ShowgroupAction extends Action
         $this->showPage();
     }
 
+    function showLocalNav()
+    {
+        $nav = new GroupNav($this, $this->group);
+        $nav->show();
+    }
+
     /**
      * Show the page content
      *

diff --git a/lib/groupnav.php b/lib/groupnav.php
index 2762949ad3342abf04e2995b6e759fb8c128c809..c499d6bff2b92720a6ed1b8b53dd1863487e7a17 100644 (file)
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -83,7 +83,7 @@ class GroupNav extends Widget
                                                                  $nickname)),
                              _('Group'),
                              sprintf(_('%s group'), $nickname),
-                             $action_name == 'all',
+                             $action_name == 'group',
                              'nav_group_group');
         $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
                                                                     $nickname)),