Merge branch 'onboarding-remix' into 1.0.x

* onboarding-remix:
  * Show the right menus in the aside after successful registration * Events surrounding successful registration output

EVENTS.txt

@@ -1375,3 +1375,9 @@ EndProfileGetAvatar: After getting an avatar for a profile
 - $profile: profile
 - $size: size of the avatar
 - &$avatar: avatar
+
+StartRegisterSuccess: Before showing the registration success message
+- $action: the registration action
+
+StartRegisterSuccess: After showing the registration success message
+- $action: the registration action

actions/register.php

@@ -605,6 +605,8 @@ class RegisterAction extends Action
      */
     function showSuccessContent()
     {
+        if (Event::handle('onStartRegisterSuccess', array($this))) {
+
             $nickname = $this->arg('nickname');
 
             $profileurl = common_local_url('showstream',
@@ -647,6 +649,9 @@ class RegisterAction extends Action
                 $this->raw(common_markup_to_html($emailinstr));
             }
             $this->elementEnd('div');
+
+            Event::handle('onEndRegisterSuccess', array($this));
+        }
     }
 
     /**
@@ -656,15 +661,23 @@ class RegisterAction extends Action
      */
     function showLocalNav()
     {
+        if (common_logged_in()) {
+            parent::showLocalNav();
+        } else {
             $nav = new LoginGroupNav($this);
             $nav->show();
         }
-
-    function showNoticeForm()
-    {
     }
 
+    /**
+     * Show a bit of login context
+     *
+     * @return nothing
+     */
     function showProfileBlock()
     {
+        if (common_logged_in()) {
+            parent::showProfileBlock();
+        }
     }
 }