Move some accounting stuff from publicgroupnav to action

More dl's and dd's. Rather than replicate them in every sub-class,
let's just put them in one place.

diff --git a/lib/action.php b/lib/action.php
index ed8b5c35251ae600750c7c99a8e38e3548b99146..9534073ec7f57b5b2257215e068026475bc1aff0 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -297,7 +297,12 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->elementStart('dl', array('id' => 'site_nav_local_views'));
+        $this->element('dt', null, _('Local views'));
+        $this->elementStart('dd');
         $this->showLocalNav();
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
         $this->showContentBlock();
         $this->showAside();
         $this->elementEnd('div');

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 1e5ed73596da1c55b7db917bd74954d0d2d54966..7860783fa48330afa701aa665f4ea8e0ccf7c4a7 100644 (file)
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -77,9 +77,6 @@ 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'),
@@ -97,7 +94,5 @@ class PublicGroupNav extends Widget
             _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
 
         $this->action->elementEnd('ul');
-        $this->action->elementEnd('dd');
-        $this->action->elementEnd('dl');
     }
 }