diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-02-20 17:19:08 -0800 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-02-20 17:19:08 -0800 |
| commit | b9f3e1e01e68dec2924746baeae1dba984a85f73 (patch) | |
| tree | 22a9295eb6c465bb026ad918721449b58b9d32b8 | |
| parent | 1fdb35bbf105fe462dcc663ea20b6aa56d654001 (diff) | |
| parent | 85694e3fa6669e3d59155e32f2cc2f8df3b9f89c (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
| -rw-r--r-- | EVENTS.txt | 6 | ||||
| -rw-r--r-- | lib/action.php | 5 | ||||
| -rw-r--r-- | theme/base/css/display.css | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index af0bee587..37e2203d5 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -82,3 +82,9 @@ StartNoticeSave: before inserting a notice (good place for content filters) EndNoticeSave: after inserting a notice and related code - $notice: notice that was saved (with ID and URI) +StartShowLocalNavBlock: Showing the local nav menu +- $action: the current action + +EndShowLocalNavBlock: At the end of the local nav menu +- $action: the current action + diff --git a/lib/action.php b/lib/action.php index 0c4d0181d..455ebeff0 100644 --- a/lib/action.php +++ b/lib/action.php @@ -474,7 +474,10 @@ class Action extends HTMLOutputter // lawsuit function showCore() { $this->elementStart('div', array('id' => 'core')); - $this->showLocalNavBlock(); + if (Event::handle('StartShowLocalNavBlock', array($this))) { + $this->showLocalNavBlock(); + Event::handle('EndShowLocalNavBlock', array($this)); + } if (Event::handle('StartShowContentBlock', array($this))) { $this->showContentBlock(); Event::handle('EndShowContentBlock', array($this)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b5796374e..be124f433 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -900,7 +900,7 @@ left:0; left:29px; } .notice-options .notice_delete { -left:76px; +right:0; } .notice-options .notice_reply dt { display:none; |