diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-19 18:22:03 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-19 18:22:03 +0000 |
| commit | 0b9cda03d5c5d4dac96e862115a10bcb11c2a597 (patch) | |
| tree | 81fad06b325f93ba3d9ee3e1631749015d04a770 | |
| parent | 930f82a95170e05ad2d4fc079cc944d29521797d (diff) | |
| parent | a5f3e3b759879aaed31a82fa98a89d6d3594af8c (diff) | |
Merge branch 'master' of /var/www/trunk
| -rw-r--r-- | actions/shownotice.php | 35 | ||||
| -rw-r--r-- | lib/action.php | 11 |
2 files changed, 43 insertions, 3 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 7033a1672..beae478ba 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -180,6 +180,18 @@ class ShownoticeAction extends Action $this->showPage(); } + + /** + * Don't show local navigation + * + * @return void + */ + + function showLocalNavBlock() + { + } + + /** * Fill the content area of the page * @@ -196,6 +208,29 @@ class ShownoticeAction extends Action $this->elementEnd('ul'); } + + + /** + * Don't show page notice + * + * @return void + */ + + function showPageNoticeBlock() + { + } + + + /** + * Don't show aside + * + * @return void + */ + + function showAside() { + } + + /** * Extra <head> content * diff --git a/lib/action.php b/lib/action.php index c056c128f..5987abf3c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -301,15 +301,20 @@ class Action extends HTMLOutputter // lawsuit function showCore() { $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->element('dt', null, _('Local views')); $this->elementStart('dd'); $this->showLocalNav(); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->showContentBlock(); - $this->showAside(); - $this->elementEnd('div'); } // SHOULD overload |