From 621c58a292884cadadbee9ad760e0c0c603f0a75 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 21:21:55 +0000 Subject: [PATCH 1/5] Updated show()'s site_nav_local_views' --- lib/publicgroupnav.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php index abda8663e3..ee087d8a86 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'), + $this->out->menuItem(common_local_url('public'), _('Public'), 'nav_timeline_public', _('Public timeline'), $this->action == 'public'); - $this->out->menuItem(common_local_url('tag'), _('Recent tags'), + $this->out->menuItem(common_local_url('tag'), _('Recent tags'), 'nav_recent-tags', _('Recent tags'), $this->action == 'tag'); if (count(common_config('nickname', 'featured')) > 0) { - $this->out->menuItem(common_local_url('featured'), _('Featured'), + $this->out->menuItem(common_local_url('featured'), _('Featured'), 'nav_featured', _('Featured users'), $this->action == 'featured'); } - $this->out->menuItem(common_local_url('favorited'), _('Popular'), + $this->out->menuItem(common_local_url('favorited'), _('Popular'), 'nav_timeline_favorited', _("Popular notices"), $this->action == 'favorited'); $this->action->elementEnd('ul'); + $this->action->elementEnd('dd'); + $this->action->elementEnd('dl') } } From e6211290422b8d42da11c4ee2e5530d5ef63a72e Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 21:23:41 +0000 Subject: [PATCH 2/5] Minor --- lib/publicgroupnav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php index ee087d8a86..458614338e 100644 --- a/lib/publicgroupnav.php +++ b/lib/publicgroupnav.php @@ -98,6 +98,6 @@ class PublicGroupNav extends Widget $this->action->elementEnd('ul'); $this->action->elementEnd('dd'); - $this->action->elementEnd('dl') + $this->action->elementEnd('dl'); } } From 60fa833908da5476e7c2e971fb60c85d7fa134e8 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 21:30:23 +0000 Subject: [PATCH 3/5] changed to class nav from id --- lib/action.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/action.php b/lib/action.php index a8b5e70b13..dd84977f0d 100644 --- a/lib/action.php +++ b/lib/action.php @@ -237,7 +237,7 @@ class Action extends HTMLOutputter // lawsuit $this->element('dt', null, _('Primary site navigation')); $this->elementStart('dd'); $user = common_current_user(); - $this->elementStart('ul', array('id' => 'nav')); + $this->elementStart('ul', array('class' => 'nav')); if ($user) { $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), _('Home')); @@ -370,7 +370,7 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('dl', array('id' => 'site_nav_global_secondary')); $this->element('dt', null, _('Secondary site navigation')); $this->elementStart('dd', null); - $this->elementStart('ul', array('id' => 'nav')); + $this->elementStart('ul', array('class' => 'nav')); $this->menuItem(common_local_url('doc', array('title' => 'help')), _('Help')); $this->menuItem(common_local_url('doc', array('title' => 'about')), From 8521cc6219d014e37779e80b09e6b63c81af952d Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 21:33:01 +0000 Subject: [PATCH 4/5] Using id param properly --- lib/publicgroupnav.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php index 458614338e..1e5ed73596 100644 --- a/lib/publicgroupnav.php +++ b/lib/publicgroupnav.php @@ -82,19 +82,19 @@ class PublicGroupNav extends Widget $this->action->elementStart('dd', null); $this->action->elementStart('ul', array('class' => 'nav')); - $this->out->menuItem(common_local_url('public'), _('Public'), 'nav_timeline_public', - _('Public timeline'), $this->action == 'public'); + $this->out->menuItem(common_local_url('public'), _('Public'), + _('Public timeline'), $this->action == 'public', 'nav_timeline_public'); - $this->out->menuItem(common_local_url('tag'), _('Recent tags'), 'nav_recent-tags', - _('Recent tags'), $this->action == 'tag'); + $this->out->menuItem(common_local_url('tag'), _('Recent tags'), + _('Recent tags'), $this->action == 'tag', 'nav_recent-tags'); if (count(common_config('nickname', 'featured')) > 0) { - $this->out->menuItem(common_local_url('featured'), _('Featured'), 'nav_featured', - _('Featured users'), $this->action == 'featured'); + $this->out->menuItem(common_local_url('featured'), _('Featured'), + _('Featured users'), $this->action == 'featured', 'nav_featured'); } - $this->out->menuItem(common_local_url('favorited'), _('Popular'), 'nav_timeline_favorited', - _("Popular notices"), $this->action == 'favorited'); + $this->out->menuItem(common_local_url('favorited'), _('Popular'), + _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited'); $this->action->elementEnd('ul'); $this->action->elementEnd('dd'); From 4f3f23c61ae58de766c1fbc6dde5d979fda72764 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 21:34:33 +0000 Subject: [PATCH 5/5] core uses id --- lib/action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/action.php b/lib/action.php index dd84977f0d..3efb65a65e 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();