GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'uiredesign' of ../csarven into uiredesign

This commit is contained in:
Evan Prodromou 2009-01-15 21:40:37 +00:00
parent 2c84f077a2 4558929eb8
commit 5b61f459d6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/action.php
View File

@ -287,7 +287,7 @@ class Action extends HTMLOutputter // lawsuit
function showCore() function showCore()
{ {
$this->elementStart('div', array('class' => 'core')); $this->elementStart('div', array('id' => 'core'));
$this->showLocalNav(); $this->showLocalNav();
$this->showContentBlock(); $this->showContentBlock();
$this->showAside(); $this->showAside();

13
lib/publicgroupnav.php
View File

@ -77,22 +77,27 @@ class PublicGroupNav extends Widget
function show() function show()
{ {
$this->action->elementStart('dl', array('id' => 'site_nav_local_views'));
$this->action->element('dt', null, _('Local views'));
$this->action->elementStart('dd', null);
$this->action->elementStart('ul', array('class' => 'nav')); $this->action->elementStart('ul', array('class' => 'nav'));
$this->out->menuItem(common_local_url('public'), _('Public'), $this->out->menuItem(common_local_url('public'), _('Public'),
_('Public timeline'), $this->action == 'public'); _('Public timeline'), $this->action == 'public', 'nav_timeline_public');
$this->out->menuItem(common_local_url('tag'), _('Recent tags'), $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
_('Recent tags'), $this->action == 'tag'); _('Recent tags'), $this->action == 'tag', 'nav_recent-tags');
if (count(common_config('nickname', 'featured')) > 0) { if (count(common_config('nickname', 'featured')) > 0) {
$this->out->menuItem(common_local_url('featured'), _('Featured'), $this->out->menuItem(common_local_url('featured'), _('Featured'),
_('Featured users'), $this->action == 'featured'); _('Featured users'), $this->action == 'featured', 'nav_featured');
} }
$this->out->menuItem(common_local_url('favorited'), _('Popular'), $this->out->menuItem(common_local_url('favorited'), _('Popular'),
_("Popular notices"), $this->action == 'favorited'); _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
$this->action->elementEnd('ul'); $this->action->elementEnd('ul');
$this->action->elementEnd('dd');
$this->action->elementEnd('dl');
} }
} }