eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes for new no-dl layout

This commit is contained in:
Evan Prodromou 2011-01-14 15:53:02 -05:00
parent 5c25364141
commit bbaf9d7f42
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/action.php
View File

@ -526,7 +526,8 @@ class Action extends HTMLOutputter // lawsuit
function showPrimaryNav() function showPrimaryNav()
{ {
$user = common_current_user(); $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 (Event::handle('StartPrimaryNav', array($this))) {
if ($user) { if ($user) {
// TRANS: Tooltip for main menu option "Personal" // TRANS: Tooltip for main menu option "Personal"
@ -672,7 +673,11 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showLocalNavBlock() 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->showLocalNav();
$this->elementEnd('div');
} }
/** /**
@ -833,7 +838,8 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showSecondaryNav() 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))) { if (Event::handle('StartSecondaryNav', array($this))) {
$this->menuItem(common_local_url('doc', array('title' => 'help')), $this->menuItem(common_local_url('doc', array('title' => 'help')),
// TRANS: Secondary navigation menu option leading to help on StatusNet. // 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 // Does a little before-after block for next/prev page
if ($have_before || $have_after) { if ($have_before || $have_after) {
$this->elementStart('ul', array('class' => 'nav pagination')); $this->elementStart('ul', array('class' => 'nav',
'id' => 'pagination'));
} }
if ($have_before) { if ($have_before) {
$pargs = array('page' => $page-1); $pargs = array('page' => $page-1);

6
theme/base/css/display.css
View File

@ -421,7 +421,7 @@ display:none;
margin-bottom:11px; margin-bottom:11px;
} }
#site_nav_global_secondary ul li { #site_nav_global_secondary li {
display:inline; display:inline;
margin-right:18px; margin-right:18px;
} }
@ -874,7 +874,9 @@ text-transform:uppercase;
font-size:1em; font-size:1em;
} }
#entity_statistics dt, #entity_statistics dt {
margin-right:11px;
}
#entity_statistics dd { #entity_statistics dd {
display:inline; display:inline;
margin-right:11px; margin-right:11px;