eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Take members and group off of group nav

Browse Source
This commit is contained in:
Evan Prodromou
2011-08-27 15:21:54 -04:00
parent 6ae214afb6
commit 725524c667
3 changed files with 13 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/groupaction.php
View File

@@ -126,7 +126,6 @@ class GroupAction extends Action
function showSections()
{
$this->showMembers();
$this->showStatistics();
$this->showAdmins();
$cloud = new GroupTagCloudSection($this, $this->group);
$cloud->show();
@@ -151,7 +150,17 @@ class GroupAction extends Action
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()
{

18
lib/groupnav.php
View File

@@ -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();

2
lib/groupprofileblock.php
View File

@@ -68,7 +68,7 @@ class GroupProfileBlock extends ProfileBlock
function url()
{
return $this->group->mainpage;
return $this->group->homeUrl();
}
function location()