From bbaf9d7f425b7b59f6e910a757c318ea2a420369 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 14 Jan 2011 15:53:02 -0500
Subject: [PATCH] some fixes for new no-dl layout

---
 lib/action.php             | 13 ++++++++++---
 theme/base/css/display.css |  6 ++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 095c410b11..96618c6083 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -526,7 +526,8 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $user = common_current_user();
-        $this->elementStart('ul', array('class' => 'nav site_nav_global_primary'));
+        $this->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_primary'));
         if (Event::handle('StartPrimaryNav', array($this))) {
             if ($user) {
                 // TRANS: Tooltip for main menu option "Personal"
@@ -672,7 +673,11 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showLocalNavBlock()
     {
+        // Need to have this ID for CSS; I'm too lazy to add it to
+        // all menus
+        $this->elementStart('div', array('id' => 'site_nav_local_views'));
         $this->showLocalNav();
+        $this->elementEnd('div');
     }
 
     /**
@@ -833,7 +838,8 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showSecondaryNav()
     {
-        $this->elementStart('ul', array('class' => 'nav site_nav_global_secondary'));
+        $this->elementStart('ul', array('class' => 'nav',
+                                        'id' => 'site_nav_global_secondary'));
         if (Event::handle('StartSecondaryNav', array($this))) {
             $this->menuItem(common_local_url('doc', array('title' => 'help')),
                             // TRANS: Secondary navigation menu option leading to help on StatusNet.
@@ -1307,7 +1313,8 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Does a little before-after block for next/prev page
         if ($have_before || $have_after) {
-            $this->elementStart('ul', array('class' => 'nav pagination'));
+            $this->elementStart('ul', array('class' => 'nav',
+                                            'id' => 'pagination'));
         }
         if ($have_before) {
             $pargs   = array('page' => $page-1);
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8c364febce..d35a8a706e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -421,7 +421,7 @@ display:none;
 margin-bottom:11px;
 }
 
-#site_nav_global_secondary ul li {
+#site_nav_global_secondary li {
 display:inline;
 margin-right:18px;
 }
@@ -874,7 +874,9 @@ text-transform:uppercase;
 font-size:1em;
 }
 
-#entity_statistics dt,
+#entity_statistics dt {
+margin-right:11px;
+}
 #entity_statistics dd {
 display:inline;
 margin-right:11px;