Partially revert r92245 per r92245 CR.

[lhc/web/wiklou.git] / skins / Standard.php

diff --git a/skins/Standard.php b/skins/Standard.php
index 38ed860..322f7b2 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -18,11 +18,13 @@ class SkinStandard extends SkinLegacy {
        var $skinname = 'standard', $stylename = 'standard',
                $template = 'StandardTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
-               $out->AddModuleStyles( 'skins.standard' );
+               $out->addModuleStyles( 'skins.standard' );
 
-               global $wgContLang;
                $qb = $this->qbSetting();
                $rules = array();
 
@@ -41,9 +43,6 @@ class SkinStandard extends SkinLegacy {
                        $rules[] = "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
                }
                $style = implode( "\n", $rules );
-               if ( $wgContLang->getDir() === 'rtl' ) {
-                       $style = CSSJanus::transform( $style, true, false );
-               }
                $out->addInlineStyle( $style );
        }
 
@@ -51,6 +50,9 @@ class SkinStandard extends SkinLegacy {
 
 class StandardTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -79,7 +81,7 @@ class StandardTemplate extends LegacyTemplate {
                $s .= "\n<br />" . $wgLang->pipeList( array(
                        $this->getSkin()->mainPageLink(),
                        $this->getSkin()->aboutLink(),
-                       $this->getSkin()->specialLink( 'Recentchanges' ),
+                       Linker::specialLink( 'Recentchanges' ),
                        $this->searchForm() ) )
                        . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
@@ -99,6 +101,9 @@ class StandardTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
 
@@ -106,7 +111,8 @@ class StandardTemplate extends LegacyTemplate {
 
                $action = $wgRequest->getText( 'action' );
                $wpPreview = $wgRequest->getBool( 'wpPreview' );
-               $tns = $this->getSkin()->getTitle()->getNamespace();
+               $title = $this->getSkin()->getTitle();
+               $tns = $title->getNamespace();
 
                $s = "\n<div id='quickbar'>";
                $s .= "\n" . $this->getSkin()->logoText() . "\n<hr class='sep' />";
@@ -118,27 +124,35 @@ class StandardTemplate extends LegacyTemplate {
                unset( $bar['SEARCH'] );
                unset( $bar['LANGUAGES'] );
                unset( $bar['TOOLBOX'] );
-               $browseLinks = reset( $bar );
 
-               foreach ( $browseLinks as $link ) {
-                       if ( $link['text'] != '-' ) {
-                               $s .= "<a href=\"{$link['href']}\">" .
-                                       htmlspecialchars( $link['text'] ) . '</a>' . $sep;
+               $barnumber = 1;
+               foreach ( $bar as $browseLinks ) {
+                       if ( $barnumber > 1 ) {
+                               $s .= "\n<hr class='sep' />";
+                       } 
+                       foreach ( $browseLinks as $link ) {
+                               if ( $link['text'] != '-' ) {
+                                       $s .= "<a href=\"{$link['href']}\">" .
+                                               htmlspecialchars( $link['text'] ) . '</a>' . $sep;
+                               }
                        }
+                       if ( $barnumber == 1 ) {
+                               // only show watchlist link if logged in
+                               if( $wgUser->isLoggedIn() ) {
+                                       $s.= Linker::specialLink( 'Watchlist' ) ;
+                                       $s .= $sep . Linker::linkKnown(
+                                               SpecialPage::getTitleFor( 'Contributions' ),
+                                               wfMsg( 'mycontris' ),
+                                               array(),
+                                               array( 'target' => $wgUser->getName() )
+                                       );
+                               }
+                       }
+                       $barnumber = $barnumber + 1;
                }
 
-               if( $wgUser->isLoggedIn() ) {
-                       $s.= $this->getSkin()->specialLink( 'Watchlist' ) ;
-                       $s .= $sep . $this->getSkin()->linkKnown(
-                               SpecialPage::getTitleFor( 'Contributions' ),
-                               wfMsg( 'mycontris' ),
-                               array(),
-                               array( 'target' => $wgUser->getName() )
-                       );
-               }
-               // only show watchlist link if logged in
                $s .= "\n<hr class='sep' />";
-               $articleExists = $this->getSkin()->getTitle()->getArticleId();
+               $articleExists = $title->getArticleId();
                if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) {
                        if( $wgOut->isArticle() ) {
                                $s .= '<strong>' . $this->editThisPage() . '</strong>';
@@ -183,17 +197,14 @@ class StandardTemplate extends LegacyTemplate {
                                                        $text = wfMsg( 'articlepage' );
                                        }
 
-                                       $link = $this->getSkin()->getTitle()->getText();
+                                       $link = $title->getText();
                                        $nstext = $wgContLang->getNsText( $tns );
                                        if( $nstext ) { # add namespace if necessary
                                                $link = $nstext . ':' . $link;
                                        }
 
-                                       $s .= $this->getSkin()->link(
-                                               Title::newFromText( $link ),
-                                               $text
-                                       );
-                               } elseif( $this->getSkin()->getTitle()->getNamespace() != NS_SPECIAL ) {
+                                       $s .= Linker::link( Title::newFromText( $link ), $text );
+                               } elseif( $title->getNamespace() != NS_SPECIAL ) {
                                        # we just throw in a "New page" text to tell the user that he's in edit mode,
                                        # and to avoid messing with the separator that is prepended to the next item
                                        $s .= '<strong>' . wfMsg( 'newpage' ) . '</strong>';
@@ -201,16 +212,15 @@ class StandardTemplate extends LegacyTemplate {
                        }
 
                        # "Post a comment" link
-                       if( ( $this->getSkin()->getTitle()->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
-                               $s .= '<br />' . $this->getSkin()->link(
-                                       $this->getSkin()->getTitle(),
+                       if( ( $title->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
+                               $s .= '<br />' . Linker::link(
+                                       $title,
                                        wfMsg( 'postcomment' ),
                                        array(),
                                        array(
                                                'action' => 'edit',
                                                'section' => 'new'
-                                       ),
-                                       array( 'known', 'noclasses' )
+                                       )
                                );
 
                        /*
@@ -223,7 +233,7 @@ class StandardTemplate extends LegacyTemplate {
                                if( $action != 'edit' && $action != 'submit' ) {
                                        $s .= $sep . $this->watchThisPage();
                                }
-                               if ( $this->getSkin()->getTitle()->userCan( 'edit' ) )
+                               if ( $title->userCan( 'edit' ) )
                                        $s .= $sep . $this->moveThisPage();
                        }
                        if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) {
@@ -241,17 +251,17 @@ class StandardTemplate extends LegacyTemplate {
                        }
 
                        if (
-                               NS_USER == $this->getSkin()->getTitle()->getNamespace() ||
-                               $this->getSkin()->getTitle()->getNamespace() == NS_USER_TALK
+                               NS_USER == $title->getNamespace() ||
+                               $title->getNamespace() == NS_USER_TALK
                        ) {
 
-                               $id = User::idFromName( $this->getSkin()->getTitle()->getText() );
-                               $ip = User::isIP( $this->getSkin()->getTitle()->getText() );
+                               $id = User::idFromName( $title->getText() );
+                               $ip = User::isIP( $title->getText() );
 
                                if( $id || $ip ){
                                        $s .= $sep . $this->userContribsLink();
                                }
-                               if( $this->showEmailUser( $id ) ) {
+                               if( $this->getSkin()->showEmailUser( $id ) ) {
                                        $s .= $sep . $this->emailUserLink();
                                }
                        }
@@ -262,7 +272,7 @@ class StandardTemplate extends LegacyTemplate {
                        $s .= $this->getUploadLink() . $sep;
                }
 
-               $s .= $this->getSkin()->specialLink( 'Specialpages' );
+               $s .= Linker::specialLink( 'Specialpages' );
 
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {