forked from GNUsocial/gnu-social
move notice form to content block
This commit is contained in:
parent
5bbcededa7
commit
53db4c2b85
@ -464,14 +464,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
|
|
||||||
Event::handle('EndShowSiteNotice', array($this));
|
Event::handle('EndShowSiteNotice', array($this));
|
||||||
}
|
}
|
||||||
if (common_logged_in()) {
|
|
||||||
if (Event::handle('StartShowNoticeForm', array($this))) {
|
|
||||||
$this->showNoticeForm();
|
|
||||||
Event::handle('EndShowNoticeForm', array($this));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$this->showAnonymousMessage();
|
|
||||||
}
|
|
||||||
$this->elementEnd('div');
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -679,6 +672,12 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
function showContentBlock()
|
function showContentBlock()
|
||||||
{
|
{
|
||||||
$this->elementStart('div', array('id' => 'content'));
|
$this->elementStart('div', array('id' => 'content'));
|
||||||
|
if (common_logged_in()) {
|
||||||
|
if (Event::handle('StartShowNoticeForm', array($this))) {
|
||||||
|
$this->showNoticeForm();
|
||||||
|
Event::handle('EndShowNoticeForm', array($this));
|
||||||
|
}
|
||||||
|
}
|
||||||
if (Event::handle('StartShowPageTitle', array($this))) {
|
if (Event::handle('StartShowPageTitle', array($this))) {
|
||||||
$this->showPageTitle();
|
$this->showPageTitle();
|
||||||
Event::handle('EndShowPageTitle', array($this));
|
Event::handle('EndShowPageTitle', array($this));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user