We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 0b9cda03 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 930f82a9 a5f3e3b7
......@@ -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
*
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment