Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --git a/EVENTS.txt b/EVENTS.txt
index af0bee587c1be7dc32eaa514ceac66848b494765..37e2203d50eb5ac8c9112626bacf0ba1cc35d411 100644 (file)
--- 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 0c4d0181db50302996e6c82f0e49db070989caf1..455ebeff0beb4f3b9898b067243fec04d5ee87d4 100644 (file)
--- 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 b5796374ecf1f0eb6974e676a1a98dc6c4bd17cd..be124f43308ca3c91017d891abd194aaced93eb5 100644 (file)
--- 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;