update to MediaWiki 1.17.0

1 files changed, 22 insertions, 39 deletions

diff --git a/skins/Simple.php b/skins/Simple.php
index 416dc3f6..87bb0b7e 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -21,48 +21,31 @@ class SkinSimple extends SkinTemplate {
 	var $skinname = 'simple', $stylename = 'simple',
 		$template = 'MonoBookTemplate', $useHeadElement = true;
 
-	function setupSkinUserCss( OutputPage $out ){
-		$out->addStyle( 'simple/main.css', 'screen' );
-		$out->addStyle( 'simple/rtl.css', '', '', 'rtl' );
-	}
+	function setupSkinUserCss( OutputPage $out ) {
+		parent::setupSkinUserCss( $out );
 
-	function reallyGenerateUserStylesheet() {
-		global $wgUser;
-		$s = '';
-		if( ( $undopt = $wgUser->getOption( 'underline' ) ) != 2 ) {
-			$underline = $undopt ? 'underline' : 'none';
-			$s .= "a { text-decoration: $underline; }\n";
-		}
-		if( $wgUser->getOption( 'highlightbroken' ) ) {
-			$s .= "a.new, #quickbar a.new { text-decoration: line-through; }\n";
-		} else {
-			$s .= <<<CSS
-a.new, #quickbar a.new,
-a.stub, #quickbar a.stub {
-	color: inherit;
-	text-decoration: inherit;
-}
-a.new:after, #quickbar a.new:after {
-	content: "?";
-	color: #CC2200;
-	text-decoration: $underline;
-}
-a.stub:after, #quickbar a.stub:after {
-	content: "!";
-	color: #772233;
-	text-decoration: $underline;
-}
-CSS;
-		}
-		if( $wgUser->getOption( 'justify' ) ) {
-			$s .= "#article, #bodyContent { text-align: justify; }\n";
+		$out->addModuleStyles( 'skins.simple' );
+
+		/* Add some userprefs specific CSS styling */
+		global $wgUser, $wgContLang;
+		$rules = array();
+		$underline = "";
+
+		if ( $wgUser->getOption( 'underline' ) < 2 ) {
+			$underline = "text-decoration: " . $wgUser->getOption( 'underline' ) ? 'underline' : 'none' . ";";
 		}
-		if( !$wgUser->getOption( 'showtoc' ) ) {
-			$s .= "#toc { display: none; }\n";
+
+		/* Also inherits from resourceloader */
+		if( !$wgUser->getOption( 'highlightbroken' ) ) {
+			$rules[] = "a.new, a.stub { color: inherit; text-decoration: inherit;}";
+			$rules[] = "a.new:after { color: #CC2200; $underline;}";
+			$rules[] = "a.stub:after { $underline; }";
 		}
-		if( !$wgUser->getOption( 'editsection' ) ) {
-			$s .= ".editsection { display: none; }\n";
+		$style = implode( "\n", $rules );
+		if ( $wgContLang->getDir() === 'rtl' ) {
+			$style = CSSJanus::transform( $style, true, false );
 		}
-		return $s;
+		$out->addInlineStyle( $style );
+
 	}
 }