Directionality improvements as part of bug 6100 (under $wgBetterDirectionality):

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

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 6dd3137..b9e4115 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -19,6 +19,9 @@ class SkinCologneBlue extends SkinLegacy {
        var $skinname = 'cologneblue', $stylename = 'cologneblue',
                $template = 'CologneBlueTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.cologneblue' );
@@ -55,6 +58,9 @@ class SkinCologneBlue extends SkinLegacy {
 
 class CologneBlueTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doBeforeContent() {
                $mainPageObj = Title::newMainPage();
 
@@ -95,6 +101,9 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function doAfterContent(){
                global $wgLang;
 
@@ -111,7 +120,7 @@ class CologneBlueTemplate extends LegacyTemplate {
 
                $s .= $this->bottomLinks();
                $s .= $wgLang->pipeList( array(
-                       "\n<br />" . $this->getSkin()->link(
+                       "\n<br />" . Linker::link(
                                Title::newMainPage(),
                                null,
                                array(),
@@ -136,6 +145,9 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function sysLinks() {
                global $wgUser, $wgLang;
                $li = SpecialPage::getTitleFor( 'Userlogin' );
@@ -150,19 +162,19 @@ class CologneBlueTemplate extends LegacyTemplate {
 
                $s = array(
                        $this->getSkin()->mainPageLink(),
-                       $this->getSkin()->linkKnown(
+                       Linker::linkKnown(
                                Title::newFromText( wfMsgForContent( 'aboutpage' ) ),
                                wfMsg( 'about' )
                        ),
-                       $this->getSkin()->linkKnown(
+                       Linker::linkKnown(
                                Title::newFromText( wfMsgForContent( 'helppage' ) ),
                                wfMsg( 'help' )
                        ),
-                       $this->getSkin()->linkKnown(
+                       Linker::linkKnown(
                                Title::newFromText( wfMsgForContent( 'faqpage' ) ),
                                wfMsg( 'faq' )
                        ),
-                       $this->getSkin()->specialLink( 'Specialpages' )
+                       Linker::specialLink( 'Specialpages' )
                );
 
                /* show links to different language variants */
@@ -173,14 +185,14 @@ class CologneBlueTemplate extends LegacyTemplate {
                        $s[] = $this->extensionTabLinks();
                }
                if ( $wgUser->isLoggedIn() ) {
-                       $s[] = $this->getSkin()->linkKnown(
+                       $s[] = Linker::linkKnown(
                                $lo,
                                wfMsg( 'logout' ),
                                array(),
                                $q
                        );
                } else {
-                       $s[] = $this->getSkin()->linkKnown(
+                       $s[] = Linker::linkKnown(
                                $li,
                                wfMsg( 'login' ),
                                array(),
@@ -194,6 +206,8 @@ class CologneBlueTemplate extends LegacyTemplate {
        /**
         * Compute the sidebar
         * @access private
+        *
+        * @return string
         */
        function quickBar(){
                global $wgOut, $wgUser;
@@ -216,12 +230,12 @@ class CologneBlueTemplate extends LegacyTemplate {
 
                $barnumber = 1;
                foreach ( $bar as $heading => $browseLinks ) {
-                       $heading_text = wfMsg ( $heading );
                        if ( $barnumber > 1 ) {
-                               if ( wfEmptyMsg( $heading, $heading_text ) ) {
-                                       $h = $heading;
+                               $headingMsg = wfMessage( $heading );
+                               if ( $headingMsg->exists() ) {
+                                       $h = $headingMsg->text();
                                } else {
-                                       $h = $heading_text;
+                                       $h = $heading;
                                }
                                $s .= "\n<h6>" . htmlspecialchars( $h ) . "</h6>";
                        }
@@ -231,14 +245,14 @@ class CologneBlueTemplate extends LegacyTemplate {
                                                htmlspecialchars( $link['text'] ) . '</a>' . $sep;
                                }
                        }
-                       $barnumber = $barnumber + 1;
+                       $barnumber++;
                }
 
                if ( $wgOut->isArticle() ) {
                        $s .= $this->menuHead( 'qbedit' );
                        $s .= '<strong>' . $this->editThisPage() . '</strong>';
 
-                       $s .= $sep . $this->getSkin()->linkKnown(
+                       $s .= $sep . Linker::linkKnown(
                                Title::newFromText( wfMsgForContent( 'edithelppage' ) ),
                                wfMsg( 'edithelp' )
                        );
@@ -289,7 +303,7 @@ class CologneBlueTemplate extends LegacyTemplate {
 
                $s .= $this->menuHead( 'qbmyoptions' );
                if ( $wgUser->isLoggedIn() ) {
-                       $tl = $this->getSkin()->link(
+                       $tl = Linker::link(
                                $wgUser->getTalkPage(),
                                wfMsg( 'mytalk' ),
                                array(),
@@ -300,30 +314,30 @@ class CologneBlueTemplate extends LegacyTemplate {
                                $tl .= ' *';
                        }
 
-                       $s .= $this->getSkin()->link(
+                       $s .= Linker::link(
                                        $wgUser->getUserPage(),
                                        wfMsg( 'mypage' ),
                                        array(),
                                        array(),
                                        array( 'known', 'noclasses' )
-                               ) . $sep . $tl . $sep . $this->getSkin()->specialLink( 'Watchlist' )
+                               ) . $sep . $tl . $sep . Linker::specialLink( 'Watchlist' )
                                        . $sep .
-                               $this->getSkin()->link(
+                               Linker::link(
                                        SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
                                        wfMsg( 'mycontris' ),
                                        array(),
                                        array(),
                                        array( 'known', 'noclasses' )
-                               ) . $sep . $this->getSkin()->specialLink( 'Preferences' )
-                               . $sep . $this->getSkin()->specialLink( 'Userlogout' );
+                               ) . $sep . Linker::specialLink( 'Preferences' )
+                               . $sep . Linker::specialLink( 'Userlogout' );
                } else {
-                       $s .= $this->getSkin()->specialLink( 'Userlogin' );
+                       $s .= Linker::specialLink( 'Userlogin' );
                }
 
                $s .= $this->menuHead( 'qbspecialpages' )
-                       . $this->getSkin()->specialLink( 'Newpages' )
-                       . $sep . $this->getSkin()->specialLink( 'Listfiles' )
-                       . $sep . $this->getSkin()->specialLink( 'Statistics' );
+                       . Linker::specialLink( 'Newpages' )
+                       . $sep . Linker::specialLink( 'Listfiles' )
+                       . $sep . Linker::specialLink( 'Statistics' );
                if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
                        $s .= $sep . $this->getUploadLink();
                }
@@ -335,7 +349,7 @@ class CologneBlueTemplate extends LegacyTemplate {
                                        . wfMsg( 'sitesupport' ) . '</a>';
                }
 
-               $s .= $sep . $this->getSkin()->link(
+               $s .= $sep . Linker::link(
                        SpecialPage::getTitleFor( 'Specialpages' ),
                        wfMsg( 'moredotdotdot' ),
                        array(),
@@ -347,11 +361,19 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @param $key string
+        * @return string
+        */
        function menuHead( $key ) {
                $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
                return $s;
        }
 
+       /**
+        * @param $label string
+        * @return string
+        */
        function searchForm( $label = '' ) {
                global $wgRequest, $wgUseTwoButtonsSearchForm;