From 725524c6673e0bc7d7977a20f30a10d0f0fa9418 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 27 Aug 2011 15:21:54 -0400
Subject: [PATCH] Take members and group off of group nav

---
 lib/groupaction.php       | 43 +++++++++++----------------------------
 lib/groupnav.php          | 18 ----------------
 lib/groupprofileblock.php |  2 +-
 3 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/lib/groupaction.php b/lib/groupaction.php
index 96d38ebab5..3b5cd52875 100644
--- a/lib/groupaction.php
+++ b/lib/groupaction.php
@@ -126,7 +126,6 @@ class GroupAction extends Action
     function showSections()
     {
         $this->showMembers();
-        $this->showStatistics();
         $this->showAdmins();
         $cloud = new GroupTagCloudSection($this, $this->group);
         $cloud->show();
@@ -149,9 +148,19 @@ class GroupAction extends Action
                                          'class' => 'section'));
 
         if (Event::handle('StartShowGroupMembersMiniList', array($this))) {
-
+             
             // TRANS: Header for mini list of group members on a group page (h2).
-            $this->element('h2', null, _('Members'));
+            $this->elementStart('h2');
+
+            $this->element('a', array('href' => common_local_url('groupmembers', array('nickname' =>
+                                                                                       $this->group->nickname))),
+                           _('Members'));
+
+            $this->text(' ');
+
+            $this->text($this->group->getMemberCount());
+            
+            $this->elementEnd('h2');
 
             $gmml = new GroupMembersMiniList($member, $this);
             $cnt = $gmml->show();
@@ -186,34 +195,6 @@ class GroupAction extends Action
         $adminSection->show();
     }
 
-    /**
-     * Show some statistics
-     *
-     * @return void
-     */
-    function showStatistics()
-    {
-        $this->elementStart('div', array('id' => 'entity_statistics',
-                                         'class' => 'section'));
-
-        // TRANS: Header for group statistics on a group page (h2).
-        $this->element('h2', null, _('Statistics'));
-
-        $this->elementStart('dl');
-
-        // TRANS: Label for group creation date.
-        $this->element('dt', null, _m('LABEL','Created'));
-        $this->element('dd', 'entity_created', date('j M Y',
-                                                 strtotime($this->group->created)));
-        // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
-        // TRANS: Label for member count in statistics on group page.
-        $this->element('dt', null, _m('LABEL','Members'));
-        $this->element('dd', null, $this->group->getMemberCount());
-        $this->elementEnd('dl');
-
-        $this->elementEnd('div');
-    }
-
 
     function noticeFormOptions()
     {
diff --git a/lib/groupnav.php b/lib/groupnav.php
index e363995655..61d3cfbd74 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -75,24 +75,6 @@ class GroupNav extends Menu
 
         $this->out->elementStart('ul', array('class' => 'nav'));
         if (Event::handle('StartGroupGroupNav', array($this))) {
-            $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
-                                                                     $nickname)),
-                                 // TRANS: Menu item in the group navigation page.
-                                 _m('MENU','Group'),
-                                 // TRANS: Tooltip for menu item in the group navigation page.
-                                 // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','%s group'), $nickname),
-                                 $action_name == 'showgroup',
-                                 'nav_group_group');
-            $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
-                                                                        $nickname)),
-                                 // TRANS: Menu item in the group navigation page.
-                                 _m('MENU','Members'),
-                                 // TRANS: Tooltip for menu item in the group navigation page.
-                                 // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','%s group members'), $nickname),
-                                 $action_name == 'groupmembers',
-                                 'nav_group_members');
 
             $cur = common_current_user();
 
diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index b5f23d288e..258a2f792e 100644
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -68,7 +68,7 @@ class GroupProfileBlock extends ProfileBlock
 
     function url()
     {
-        return $this->group->mainpage;
+        return $this->group->homeUrl();
     }
 
     function location()
-- 
2.39.5