1 files changed, 31 insertions, 11 deletions

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index a7eae66d..2b9b2f67 100644
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -24,13 +24,13 @@ class SkinNostalgia extends Skin {
 	}
 
 	function doBeforeContent() {
-
-		$s = "\n<div id='content'>\n<div id='topbar'>";
-		$s .= $this->logoText( "right" );
+		$s = "\n<div id='content'>\n<div id='top'>\n";
+		$s .= "<div id=\"logo\">".$this->logoText( "right" )."</div>";
 
 		$s .= $this->pageTitle();
 		$s .= $this->pageSubtitle() . "\n";
 
+		$s .= "<div id=\"topbar\">";
 		$s .= $this->topLinks() . "\n<br />";
 
 		$notice = wfGetSiteNotice();
@@ -45,34 +45,54 @@ class SkinNostalgia extends Skin {
 		$cat = $this->getCategoryLinks();
 		if($cat) $s .= "<br />" . $cat;
 
-		$s .= "<br clear='all' /><hr />\n</div>\n";
+		$s .= "<br clear='all' /></div><hr />\n</div
+>\n";
 		$s .= "\n<div id='article'>";
 
 		return $s;
 	}
 
 	function topLinks() {
-		global $wgOut, $wgUser;
+		global $wgOut, $wgUser, $wgEnableUploads;
 		$sep = " |\n";
 
 		$s = $this->mainPageLink() . $sep
-		  . $this->specialLink( "recentchanges" );
+		  . $this->specialLink( 'recentchanges' );
 
 		if ( $wgOut->isArticle() ) {
 			$s .=  $sep . $this->editThisPage()
 			  . $sep . $this->historyLink();
 		}
-		
+
 		/* show links to different language variants */
 		$s .= $this->variantLinks();
 		$s .= $this->extensionTabLinks();
-		
 		if ( $wgUser->isAnon() ) {
-			$s .= $sep . $this->specialLink( "userlogin" );
+			$s .= $sep . $this->specialLink( 'userlogin' );
 		} else {
-			$s .= $sep . $this->specialLink( "userlogout" );
+			$name = $wgUser->getName();
+			/* show user page and user talk links */
+			$s .= $sep . $this->link( $wgUser->getUserPage(), wfMsgHtml( 'mypage' ) );
+			$s .= $sep . $this->link( $wgUser->getTalkPage(), wfMsgHtml( 'mytalk' ) );
+			if ( $wgUser->getNewtalk() ) {
+				$s .= ' *';
+			}
+			/* show watchlist link */
+			$s .= $sep . $this->specialLink( 'watchlist' );
+			/* show my contributions link */
+			$s .= $sep . $this->link(
+				SpecialPage::getSafeTitleFor( "Contributions", $wgUser->getName() ),
+				wfMsgHtml( 'mycontris' ) );
+			/* show my preferences link */
+			$s .= $sep . $this->specialLink( 'preferences' );
+			/* show upload file link */
+			if ( $wgEnableUploads ) {
+				$s .= $sep . $this->specialLink( 'upload' );
+			}
+			/* show log out link */
+			$s .= $sep . $this->specialLink( 'userlogout' );
 		}
-		
+
 		$s .= $sep . $this->specialPagesList();
 
 		return $s;