We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 5b61f459 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 2c84f077 4558929e
......@@ -287,7 +287,7 @@ class Action extends HTMLOutputter // lawsuit
function showCore()
{
$this->elementStart('div', array('class' => 'core'));
$this->elementStart('div', array('id' => 'core'));
$this->showLocalNav();
$this->showContentBlock();
$this->showAside();
......
......@@ -77,22 +77,27 @@ class PublicGroupNav extends Widget
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->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'),
_('Recent tags'), $this->action == 'tag');
_('Recent tags'), $this->action == 'tag', 'nav_recent-tags');
if (count(common_config('nickname', 'featured')) > 0) {
$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'),
_("Popular notices"), $this->action == 'favorited');
_("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
$this->action->elementEnd('ul');
$this->action->elementEnd('dd');
$this->action->elementEnd('dl');
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment