Stylize maintenance folder..

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

diff --git a/skins/Standard.php b/skins/Standard.php
index 5923e16..4942729 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -6,8 +6,9 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
+}
 
 /**
  * @todo document
@@ -15,27 +16,13 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinStandard extends Skin {
 
-       /**
-        *
-        */
-       function getHeadScripts( $allowUserJs ) {
-               global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
-
-               $s = parent::getHeadScripts( $allowUserJs );
-               if ( 3 == $this->qbSetting() ) { # Floating left
-                       $s .= "<script language='javascript' type='$wgJsMimeType' " .
-                         "src='{$wgStylePath}/common/sticky.js?$wgStyleVersion'></script>\n";
-               }
-               return $s;
-       }
-
        /**
         *
         */
        function setupSkinUserCss( OutputPage $out ){
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $out->addStyle( 'common/quickbar.css' );
-               } else if ( 4 == $this->qbSetting() ) { # Floating right
+               } elseif ( 4 == $this->qbSetting() ) { # Floating right
                        $out->addStyle( 'common/quickbar-right.css' );
                }
                parent::setupSkinUserCss( $out );
@@ -50,36 +37,19 @@ class SkinStandard extends Skin {
 
                if ( 2 == $qb ) { # Right
                        $s .= "#quickbar { position: absolute; top: 4px; right: 4px; " .
-                         "border-left: 2px solid #000000; }\n" .
-                         "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n";
-               } else if ( 1 == $qb || 3 == $qb ) {
+                               "border-left: 2px solid #000000; }\n" .
+                               "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n";
+               } elseif ( 1 == $qb || 3 == $qb ) {
                        $s .= "#quickbar { position: absolute; top: 4px; left: 4px; " .
-                         "border-right: 1px solid gray; }\n" .
-                         "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n";
-               } else if ( 4 == $qb) {
+                               "border-right: 1px solid gray; }\n" .
+                               "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n";
+               } elseif ( 4 == $qb ) {
                        $s .= "#quickbar { border-right: 1px solid gray; }\n" .
-                         "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n";
+                               "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n";
                }
                return $s;
        }
 
-       /**
-        *
-        */
-       function getBodyOptions() {
-               $a = parent::getBodyOptions();
-
-               if ( 3 == $this->qbSetting() ) { # Floating left
-                       $qb = "setup(\"quickbar\")";
-                       if( $a['onload'] ) {
-                               $a['onload'] .= ";$qb";
-                       } else {
-                               $a['onload'] = $qb;
-                       }
-               }
-               return $a;
-       }
-
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -95,14 +65,16 @@ class SkinStandard extends Skin {
                $qb = $this->qbSetting();
                $shove = ( $qb != 0 );
                $left = ( $qb == 1 || $qb == 3 );
-               if( $wgContLang->isRTL() ) $left = !$left;
+               if( $wgContLang->isRTL() ) {
+                       $left = !$left;
+               }
 
                if ( $shove && $left ) { # Left
-                               $s .= $this->getQuickbarCompensator();
+                       $s .= $this->getQuickbarCompensator();
                }
                wfProfileOut( __METHOD__ . '-2' );
                wfProfileIn( __METHOD__ . '-3' );
-               $l = $wgContLang->isRTL() ? 'right' : 'left';
+               $l = $wgContLang->alignStart();
                $s .= "<td class='bottom' align='$l' valign='top'>";
 
                $s .= $this->bottomLinks();
@@ -111,7 +83,7 @@ class SkinStandard extends Skin {
                        $this->aboutLink(),
                        $this->specialLink( 'recentchanges' ),
                        $this->searchForm() ) )
-                 . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
+                       . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
                $s .= '</td>';
                if ( $shove && !$left ) { # Right
@@ -253,14 +225,14 @@ class SkinStandard extends Skin {
                        article with "Watch this article" checkbox disabled, the article is transparently
                        unwatched. Therefore we do not show the "Watch this page" link in edit mode
                        */
-                       if ( $wgUser->isLoggedIn() && $articleExists) {
-                               if( $action != 'edit' && $action != 'submit' ){
+                       if ( $wgUser->isLoggedIn() && $articleExists ) {
+                               if( $action != 'edit' && $action != 'submit' ) {
                                        $s .= $sep . $this->watchThisPage();
                                }
                                if ( $this->mTitle->userCan( 'edit' ) )
                                        $s .= $sep . $this->moveThisPage();
                        }
-                       if ( $wgUser->isAllowed( 'delete' ) and $articleExists ) {
+                       if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) {
                                $s .= $sep . $this->deleteThisPage() .
                                $sep . $this->protectThisPage();
                        }
@@ -268,14 +240,16 @@ class SkinStandard extends Skin {
                        if( $articleExists && $action != 'history' ) {
                                $s .= $sep . $this->historyLink();
                        }
-                       $s.= $sep . $this->whatLinksHere();
+                       $s .= $sep . $this->whatLinksHere();
 
                        if( $wgOut->isArticleRelated() ) {
                                $s .= $sep . $this->watchPageLinksLink();
                        }
 
-                       if ( NS_USER == $this->mTitle->getNamespace()
-                               || $this->mTitle->getNamespace() == NS_USER_TALK ) {
+                       if (
+                               NS_USER == $this->mTitle->getNamespace() ||
+                               $this->mTitle->getNamespace() == NS_USER_TALK
+                       ) {
 
                                $id = User::idFromName( $this->mTitle->getText() );
                                $ip = User::isIP( $this->mTitle->getText() );
@@ -290,9 +264,10 @@ class SkinStandard extends Skin {
                        $s .= "\n<br /><hr class='sep' />";
                }
 
-               if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
-                       $s .= $this->specialLink( 'upload' ) . $sep;
+               if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+                       $s .= $this->uploadLink() . $sep;
                }
+
                $s .= $this->specialLink( 'specialpages' );
 
                global $wgSiteSupportPage;