Move object menu into aside

This commit is contained in:
Brion Vibber 2011-03-09 10:38:44 -08:00
parent 1d29ba8315
commit 1f86f45bb9

View File

@ -669,10 +669,6 @@ class Action extends HTMLOutputter // lawsuit
$this->showContentBlock(); $this->showContentBlock();
Event::handle('EndShowContentBlock', array($this)); Event::handle('EndShowContentBlock', array($this));
} }
if (Event::handle('StartShowObjectNavBlock', array($this))) {
$this->showObjectNavBlock();
Event::handle('EndShowObjectNavBlock', array($this));
}
if (Event::handle('StartShowAside', array($this))) { if (Event::handle('StartShowAside', array($this))) {
$this->showAside(); $this->showAside();
Event::handle('EndShowAside', array($this)); Event::handle('EndShowAside', array($this));
@ -828,6 +824,10 @@ class Action extends HTMLOutputter // lawsuit
{ {
$this->elementStart('div', array('id' => 'aside_primary', $this->elementStart('div', array('id' => 'aside_primary',
'class' => 'aside')); 'class' => 'aside'));
if (Event::handle('StartShowObjectNavBlock', array($this))) {
$this->showObjectNavBlock();
Event::handle('EndShowObjectNavBlock', array($this));
}
if (Event::handle('StartShowSections', array($this))) { if (Event::handle('StartShowSections', array($this))) {
$this->showSections(); $this->showSections();
Event::handle('EndShowSections', array($this)); Event::handle('EndShowSections', array($this));