API: Make action=block return an ISO 8601 timestamp rather than a UNIX timestamp

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

diff --git a/skins/Standard.php b/skins/Standard.php
index 1b1b309..7d4eb9a 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * See skin.txt
+ * See docs/skin.txt
  *
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @file
+ * @ingroup Skins
  */
 
 if( !defined( 'MEDIAWIKI' ) )
@@ -12,21 +12,20 @@ if( !defined( 'MEDIAWIKI' ) )
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @ingroup Skins
  */
 class SkinStandard extends Skin {
 
        /**
         *
         */
-       function getHeadScripts() {
-               global $wgStylePath, $wgJsMimeType;
+       function getHeadScripts( $allowUserJs ) {
+               global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
 
-               $s = parent::getHeadScripts();
+               $s = parent::getHeadScripts( $allowUserJs );
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $s .= "<script language='javascript' type='$wgJsMimeType' " .
-                         "src='{$wgStylePath}/common/sticky.js'></script>\n";
+                         "src='{$wgStylePath}/common/sticky.js?$wgStyleVersion'></script>\n";
                }
                return $s;
        }
@@ -35,14 +34,14 @@ class SkinStandard extends Skin {
         *
         */
        function getUserStyles() {
-               global $wgStylePath;
+               global $wgStylePath, $wgStyleVersion;
                $s = '';
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $s .= "<style type='text/css'>\n" .
-                         "@import '{$wgStylePath}/common/quickbar.css';\n</style>\n";
+                         "@import '{$wgStylePath}/common/quickbar.css?$wgStyleVersion';\n</style>\n";
                } else if ( 4 == $this->qbSetting() ) { # Floating right
                        $s .= "<style type='text/css'>\n" .
-                         "@import '{$wgStylePath}/common/quickbar-right.css';\n</style>\n";
+                         "@import '{$wgStylePath}/common/quickbar-right.css?$wgStyleVersion';\n</style>\n";
                }
                $s .= parent::getUserStyles();
                return $s;
@@ -52,18 +51,16 @@ class SkinStandard extends Skin {
         *
         */
        function doGetUserStyles() {
-               global $wgStylePath, $wgLang, $wgUser;
+               global $wgStylePath;
 
                $s = parent::doGetUserStyles();
                $qb = $this->qbSetting();
 
-               if ( (!$wgUser->isLoggedIn() && $wgLang->isRTL() ) ||
-                    ( 2 == $qb ) ) { # Right
+               if ( 2 == $qb ) { # Right
                        $s .= "#quickbar { position: absolute; top: 4px; right: 4px; " .
                          "border-left: 2px solid #000000; }\n" .
                          "#article { margin-left: 4px; margin-right: 152px; }\n";
-               } else if ( (!$wgUser->isLoggedIn()) ||
-                 ( 1 == $qb || 3 == $qb ) ) {
+               } else if ( 1 == $qb || 3 == $qb ) {
                        $s .= "#quickbar { position: absolute; top: 4px; left: 4px; " .
                          "border-right: 1px solid gray; }\n" .
                          "#article { margin-left: 152px; margin-right: 4px; }\n";
@@ -92,7 +89,7 @@ class SkinStandard extends Skin {
        }
 
        function doAfterContent() {
-               global $wgLang;
+               global $wgContLang;
                $fname =  'SkinStandard::doAfterContent';
                wfProfileIn( $fname );
                wfProfileIn( $fname.'-1' );
@@ -107,14 +104,14 @@ class SkinStandard extends Skin {
                $qb = $this->qbSetting();
                $shove = ($qb != 0);
                $left = ($qb == 1 || $qb == 3);
-               if($wgLang->isRTL()) $left = !$left;
+               if($wgContLang->isRTL()) $left = !$left;
 
                if ( $shove && $left ) { # Left
                                $s .= $this->getQuickbarCompensator();
                }
                wfProfileOut( $fname.'-2' );
                wfProfileIn( $fname.'-3' );
-               $l = $wgLang->isRTL() ? 'right' : 'left';
+               $l = $wgContLang->isRTL() ? 'right' : 'left';
                $s .= "<td class='bottom' align='$l' valign='top'>";
 
                $s .= $this->bottomLinks();
@@ -179,32 +176,42 @@ class SkinStandard extends Skin {
                        } else { # backlink to the article in edit or history mode
                                if($articleExists){ # no backlink if no article
                                        switch($tns) {
-                                               case 0:
-                                               $text = wfMsg('articlepage');
-                                               break;
-                                               case 1:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 2:
-                                               $text = wfMsg('userpage');
-                                               break;
-                                               case 3:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 4:
-                                               $text = wfMsg('projectpage');
-                                               break;
-                                               case 5:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 6:
-                                               $text = wfMsg('imagepage');
-                                               break;
-                                               case 7:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
+                                               case NS_TALK:
+                                               case NS_USER_TALK:
+                                               case NS_PROJECT_TALK:
+                                               case NS_IMAGE_TALK:
+                                               case NS_MEDIAWIKI_TALK:
+                                               case NS_TEMPLATE_TALK:
+                                               case NS_HELP_TALK:
+                                               case NS_CATEGORY_TALK:
+                                                       $text = wfMsg('viewtalkpage');
+                                                       break;
+                                               case NS_MAIN:
+                                                       $text = wfMsg( 'articlepage' );
+                                                       break;
+                                               case NS_USER:
+                                                       $text = wfMsg( 'userpage' );
+                                                       break;
+                                               case NS_PROJECT:
+                                                       $text = wfMsg( 'projectpage' );
+                                                       break;
+                                               case NS_IMAGE:
+                                                       $text = wfMsg( 'imagepage' );
+                                                       break;
+                                               case NS_MEDIAWIKI:
+                                                       $text = wfMsg( 'mediawikipage' );
+                                                       break;
+                                               case NS_TEMPLATE:
+                                                       $text = wfMsg( 'templatepage' );
+                                                       break;
+                                               case NS_HELP:
+                                                       $text = wfMsg( 'viewhelppage' );
+                                                       break;
+                                               case NS_CATEGORY:
+                                                       $text = wfMsg( 'categorypage' );
+                                                       break;
                                                default:
-                                               $text= wfMsg('articlepage');
+                                                       $text= wfMsg( 'articlepage' );
                                        }
 
                                        $link = $wgTitle->getText();
@@ -240,7 +247,7 @@ class SkinStandard extends Skin {
                                {
                                        $s .= $sep . $this->watchThisPage();
                                }
-                               if ( $wgTitle->userCanEdit() )
+                               if ( $wgTitle->userCan( 'edit' ) )
                                        $s .= $sep . $this->moveThisPage();
                        }
                        if ( $wgUser->isAllowed('delete') and $articleExists ) {
@@ -293,4 +300,4 @@ class SkinStandard extends Skin {
 
 }
 
-?>
+