Merge commit 'refs/merge-requests/55' of https://gitorious.org/social/mainline into merge-requests/55

EVENTS.txt

@@ -1481,3 +1481,9 @@ EndSubMenu: After outputting a submenu (including enclosing tags) to HTML
 - $out:     HTMLOutputter used to output (usually an Action, but not always!)
 - $menu:    The Menu object outputted as a submenu.
 - $label:   Localized text which represents the menu item.
+
+StartDocNav: Before outputting the docs Nav
+- $nav: The DoclNav widget
+
+EndDocNav: After outputting the docs Nav
+- $nav: The DoclNav widget

actions/doc.php

@@ -174,11 +174,15 @@ class DocNav extends Menu
 {
     function show()
     {
-        $stub = new HomeStubNav($this->action);
-        $this->submenu(_m('MENU','Home'), $stub);
+        if (Event::handle('StartDocNav', array($this))) {
+            $stub = new HomeStubNav($this->action);
+            $this->submenu(_m('MENU','Home'), $stub);
 
-        $docs = new DocListNav($this->action);
-        $this->submenu(_m('MENU','Docs'), $docs);
+            $docs = new DocListNav($this->action);
+            $this->submenu(_m('MENU','Docs'), $docs);
+            
+            Event::handle('EndDocNav', array($this));
+        }
     }
 }
 

theme/base/css/display.css

@@ -1456,6 +1456,10 @@ margin-left:0;
     margin-left: 56px;
 }
 
+.threaded-replies .notice > footer, .section .notice > footer {
+    margin-left:33px;
+}
+
 .notice > footer .timestamp span.p-name {
     display: none;
 }