push notice form and sub-menu into header div

darcs-hash:20080611183634-84dde-97119e7ef1abb01f6ce8723955dc5d6e06e644a8.gz

1 files changed, 12 insertions, 9 deletions

diff --git a/actions/all.php b/actions/all.php
index 06d88477d..44e3fd239 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -45,15 +45,8 @@ class AllAction extends StreamAction {
 		# Looks like we're good; show the header
 
 		common_show_header($profile->nickname . _t(" and friends"),
-						   array($this, 'show_header'), $user);
-		
-		$cur = common_current_user();
-		
-		if ($cur && $cur->id == $profile->id) {
-			common_notice_form();
-		}
-		
-		$this->views_menu();
+						   array($this, 'show_header'), $user,
+						   array($this, 'show_top'));
 		
 		$this->show_notices($profile);
 		
@@ -68,6 +61,16 @@ class AllAction extends StreamAction {
 									 'title' => _t('Feed for friends of ') . $user->nickname));
 	}
 
+	function show_top($user) {
+		$cur = common_current_user();
+		
+		if ($cur && $cur->id == $user->id) {
+			common_notice_form();
+		}
+		
+		$this->views_menu();
+	}
+	
 	function show_notices($profile) {
 
 		$notice = DB_DataObject::factory('notice');