summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-15 21:40:37 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-15 21:40:37 +0000
commit5b61f459d6486c523d927839bbc078a49e51d2ab (patch)
tree0c712dba45e994d07c94038208f72cff4744f4f0 /lib
parent2c84f077a2a41cb9c71ef79a33083b6084a0556b (diff)
parent4558929eb84a836777b59124c01a1795cc6400cb (diff)
Merge branch 'uiredesign' of ../csarven into uiredesign
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php2
-rw-r--r--lib/publicgroupnav.php13
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/action.php b/lib/action.php
index d5eb6de2d..76962482f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -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();
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index abda8663e..1e5ed7359 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -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');
}
}