GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of /var/www/trunk

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-19 18:22:03 +00:00
commit 0b9cda03d5
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
actions/shownotice.php
View File

@ -180,6 +180,18 @@ class ShownoticeAction extends Action
$this->showPage(); $this->showPage();
} }
/**
* Don't show local navigation
*
* @return void
*/
function showLocalNavBlock()
{
}
/** /**
* Fill the content area of the page * Fill the content area of the page
* *
@ -196,6 +208,29 @@ class ShownoticeAction extends Action
$this->elementEnd('ul'); $this->elementEnd('ul');
} }
/**
* Don't show page notice
*
* @return void
*/
function showPageNoticeBlock()
{
}
/**
* Don't show aside
*
* @return void
*/
function showAside() {
}
/** /**
* Extra <head> content * Extra <head> content
* *

11
lib/action.php
View File

@ -301,15 +301,20 @@ class Action extends HTMLOutputter // lawsuit
function showCore() function showCore()
{ {
$this->elementStart('div', array('id' => 'core')); $this->elementStart('div', array('id' => 'core'));
$this->showLocalNavBlock();
$this->showContentBlock();
$this->showAside();
$this->elementEnd('div');
}
function showLocalNavBlock()
{
$this->elementStart('dl', array('id' => 'site_nav_local_views')); $this->elementStart('dl', array('id' => 'site_nav_local_views'));
$this->element('dt', null, _('Local views')); $this->element('dt', null, _('Local views'));
$this->elementStart('dd'); $this->elementStart('dd');
$this->showLocalNav(); $this->showLocalNav();
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->showContentBlock();
$this->showAside();
$this->elementEnd('div');
} }
// SHOULD overload // SHOULD overload