X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=skins%2FStandard.php;h=1114e7d0a173230022ce119f46f87ce9e632b52a;hb=8c8b2899552ff0557e95031f95d90ea1b8973295;hp=b29748ee2c005dbe66c7cdf3c16a5dca5867ace8;hpb=e33f0f8907e9e49481fef7a544016c590f721e53;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/Standard.php b/skins/Standard.php
index b29748ee2c..1114e7d0a1 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -30,20 +30,23 @@ class SkinStandard extends SkinLegacy {
 
 		if ( 2 == $qb ) { # Right
 			$rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; right: 4px; border-left: 2px solid #000000; }";
-			$rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-left: 4px; margin-right: 152px; }";
+			$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }";
+			$rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
 		} elseif ( 1 == $qb || 3 == $qb ) {
 			$rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; left: 4px; border-right: 1px solid gray; }";
-			$rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-left: 152px; margin-right: 4px; }";
+			$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }";
+			$rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }";
 			if( 3 == $qb ) {
 				$rules[] = "/* @noflip */#quickbar { position: fixed; padding: 4px; }";
 			}
 		} elseif ( 4 == $qb ) {
-			$rules[] = "/* @noflip */#quickbar { position: fixed; right: 0px; top: 0px; padding: 4px;}";
+			$rules[] = "/* @noflip */#quickbar { position: fixed; right: 0; top: 0; padding: 4px; }";
 			$rules[] = "/* @noflip */#quickbar { border-right: 1px solid gray; }";
-			$rules[] = "/* @noflip */#article, /* @noflip */#mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
+			$rules[] = "/* @noflip */#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
+			$rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
 		}
- 		$style = implode( "\n", $rules );
-		$out->addInlineStyle( $style, /* flip css if RTL */true );
+		$style = implode( "\n", $rules );
+		$out->addInlineStyle( $style, 'flip' );
 	}
 
 }
@@ -54,7 +57,6 @@ class StandardTemplate extends LegacyTemplate {
 	 * @return string
 	 */
 	function doAfterContent() {
-		global $wgContLang;
 		wfProfileIn( __METHOD__ );
 		wfProfileIn( __METHOD__ . '-1' );
 
@@ -64,21 +66,11 @@ class StandardTemplate extends LegacyTemplate {
 
 		wfProfileOut( __METHOD__ . '-1' );
 		wfProfileIn( __METHOD__ . '-2' );
-
-		$qb = $this->getSkin()->qbSetting();
-		$shove = ( $qb != 0 );
-		$left = ( $qb == 1 || $qb == 3 );
-
-		if ( $shove && $left ) { # Left
-			$s .= $this->getQuickbarCompensator();
-		}
-		wfProfileOut( __METHOD__ . '-2' );
-		wfProfileIn( __METHOD__ . '-3' );
-		$l = $wgContLang->alignStart();
+		$l = $this->getSkin()->getLanguage()->alignStart();
 		$s .= "<td class='bottom' align='$l' valign='top'>";
 
 		$s .= $this->bottomLinks();
-		$s .= "\n<br />" . $this->getSkin()->getLang()->pipeList( array(
+		$s .= "\n<br />" . $this->getSkin()->getLanguage()->pipeList( array(
 			$this->getSkin()->mainPageLink(),
 			$this->getSkin()->aboutLink(),
 			Linker::specialLink( 'Recentchanges' ),
@@ -86,17 +78,14 @@ class StandardTemplate extends LegacyTemplate {
 			. '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
 		$s .= '</td>';
-		if ( $shove && !$left ) { # Right
-			$s .= $this->getQuickbarCompensator();
-		}
 		$s .= "</tr></table>\n</div>\n</div>\n";
 
-		wfProfileOut( __METHOD__ . '-3' );
-		wfProfileIn( __METHOD__ . '-4' );
-		if ( 0 != $qb ) {
+		wfProfileOut( __METHOD__ . '-2' );
+		wfProfileIn( __METHOD__ . '-3' );
+		if ( $this->getSkin()->qbSetting() != 0 ) {
 			$s .= $this->quickBar();
 		}
-		wfProfileOut( __METHOD__ . '-4' );
+		wfProfileOut( __METHOD__ . '-3' );
 		wfProfileOut( __METHOD__ );
 		return $s;
 	}
@@ -127,13 +116,15 @@ class StandardTemplate extends LegacyTemplate {
 
 		$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 ( is_array( $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 ) {
@@ -152,7 +143,7 @@ class StandardTemplate extends LegacyTemplate {
 		}
 
 		$s .= "\n<hr class='sep' />";
-		$articleExists = $title->getArticleId();
+		$articleExists = $title->getArticleID();
 		if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) {
 			if( $this->data['isarticle'] ) {
 				$s .= '<strong>' . $this->editThisPage() . '</strong>';
@@ -223,12 +214,12 @@ class StandardTemplate extends LegacyTemplate {
 					)
 				);
 
-			/*
-			watching could cause problems in edit mode:
-			if user edits article, then loads "watch this article" in background and then saves
-			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
-			*/
+			/**
+			 * Watching could cause problems in edit mode:
+			 * if user edits article, then loads "watch this article" in background and then saves
+			 * 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 ( $this->data['loggedin'] && $articleExists ) {
 				if( $action != 'edit' && $action != 'submit' ) {
 					$s .= $sep . $this->watchThisPage();
@@ -277,7 +268,7 @@ class StandardTemplate extends LegacyTemplate {
 		global $wgSiteSupportPage;
 		if( $wgSiteSupportPage ) {
 			$s .= "\n<br /><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
-			  '" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
+			'" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
 		}
 
 		$s .= "\n<br /></div>\n";