From 3de65b1f2c0acf6474f11441c1574f3a7df7c666 Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Sat, 22 Jan 2011 22:46:33 +0000
Subject: [PATCH] Port Modern to resourceloader

Refs bug 26649
---
 resources/Resources.php |  4 ++++
 skins/Modern.php        |  7 ++-----
 skins/modern/main.css   | 22 +++++++++++++++++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/resources/Resources.php b/resources/Resources.php
index a2f9a543fe..3bd1d3aafd 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -27,6 +27,10 @@ return array(
 	'skins.chick' => array(
 		'styles' => array( 'skins/chick/main.css' => array( 'media' => 'screen,handheld' ) ),
 	),
+	'skins.modern' => array(
+		'styles' => array( 'skins/modern/main.css' => array( 'media' => 'screen' ),
+				   'skins/modern/print.css' => array( 'media' => 'print' ) ),
+	),
 
 	/* jQuery */
 
diff --git a/skins/Modern.php b/skins/Modern.php
index 1871adfb81..6c315b9eb5 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -22,11 +22,8 @@ class SkinModern extends SkinTemplate {
 		$template = 'ModernTemplate', $useHeadElement = true;
 
 	function setupSkinUserCss( OutputPage $out ){
-		// Do not call parent::setupSkinUserCss(), we have our own print style
-		$out->addStyle( 'common/shared.css', 'screen' );
-		$out->addStyle( 'modern/main.css', 'screen' );
-		$out->addStyle( 'modern/print.css', 'print' );
-		$out->addStyle( 'modern/rtl.css', 'screen', '', 'rtl' );
+		parent::setupSkinUserCss( $out );
+		$out->addModuleStyles ('skins.modern');
 	}
 }
 
diff --git a/skins/modern/main.css b/skins/modern/main.css
index 9dc171709a..fec902c844 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -8,6 +8,9 @@ body {
 	font-family: sans-serif;
 	color: black;
 	background-color: #f0f0f0;
+
+	direction: ltr;
+	unicode-bidi: embed;
 }
 
 #mw_main,
@@ -182,6 +185,7 @@ textarea {
 }
 
 ul {
+	/* @embed */
 	list-style-image: url(bullet.gif);
 }
 
@@ -245,6 +249,7 @@ ul {
 
 #footer {
 	background-color: #f0f0f0;
+	/* @embed */
 	background: url(footer-grad.png) repeat-x 0 0;
 	padding: 10px 1em 1em 1em;
 	clear:both;
@@ -407,31 +412,37 @@ h1, h2, h3, h4, h5, h6 {
 
 #mw_content a.external,
 #mw_content a[href ^="gopher://"] {
+	/* @embed */
 	background: url(external.png) center right no-repeat;
 	padding-right: 13px;
 }
 #mw_content a[href ^="https://"],
 .link-https {
+	/* @embed */
 	background: url(lock_icon.gif) center right no-repeat;
 	padding-right: 16px;
 }
 #mw_content a[href ^="mailto:"],
 .link-mailto {
+	/* @embed */
 	background: url(mail_icon.gif) center right no-repeat;
 	padding-right: 18px;
 }
 #mw_content a[href ^="news://"] {
+	/* @embed */
 	background: url(news_icon.png) center right no-repeat;
 	padding-right: 18px;
 }
 #mw_content a[href ^="ftp://"],
 .link-ftp {
+	/* @embed */
 	background: url(file_icon.gif) center right no-repeat;
 	padding-right: 18px;
 }
 #mw_content a[href ^="irc://"],
 #mw_content a.extiw[href ^="irc://"],
 .link-irc {
+	/* @embed */
 	background: url(discussionitem_icon.gif) center right no-repeat;
 	padding-right: 18px;
 }
@@ -443,6 +454,7 @@ h1, h2, h3, h4, h5, h6 {
 #mw_content a.external[href $=".wav"], #mw_content a.external[href $=".WAV"],
 #mw_content a.external[href $=".wma"], #mw_content a.external[href $=".WMA"],
 .link-audio {
+	/* @embed */
 	background: url("audio.png") center right no-repeat;
 	padding-right: 13px;
 }
@@ -451,6 +463,7 @@ h1, h2, h3, h4, h5, h6 {
 #mw_content a.external[href $=".mpeg"], #mw_content a.external[href $=".MPEG"],
 #mw_content a.external[href $=".mpg"], #mw_content a.external[href $=".MPG"],
 .link-video {
+	/* @embed */
 	background: url("video.png") center right no-repeat;
 	padding-right: 13px;
 }
@@ -458,11 +471,13 @@ h1, h2, h3, h4, h5, h6 {
 #mw_content a.external[href *=".pdf#"], #mw_content a.external[href *=".PDF#"],
 #mw_content a.external[href *=".pdf?"], #mw_content a.external[href *=".PDF?"],
 .link-document {
+	/* @embed */
 	background: url("document.png") center right no-repeat;
 	padding-right: 12px;
 }
 
 /* images */
+/* @noflip */
 div.floatright, table.floatright {
 	clear: right;
 	float: right;
@@ -475,6 +490,7 @@ div.floatright, table.floatright {
 */
 }
 div.floatright p { font-style: italic; }
+/* @noflip */
 div.floatleft, table.floatleft {
 	float: left;
 	clear: left;
@@ -521,11 +537,13 @@ div.magnify a, div.magnify img {
 	border: none !important;
 	background: none !important;
 }
+/* @noflip */
 div.tright {
 	clear: right;
 	float: right;
 	margin: .5em 0 .8em 1.4em;
 }
+/* @noflip */
 div.tleft {
 	float: left;
 	clear: left;
@@ -793,6 +811,7 @@ ul {
 	list-style-type: square;
 	margin: .3em 0 0 1.5em;
 	padding: 0;
+	/* @embed */
 	list-style-image: url(bullet.gif);
 }
 ol {
@@ -836,6 +855,7 @@ pre {
 	border-collapse: collapse;
 	margin: 0 -1em 1em -1em;
 	padding: 0 0 8px 0;
+	/* @embed */
 	background: url(footer-grad.png) repeat-x bottom left;
 }
 
@@ -880,4 +900,4 @@ pre {
 /* Tooltips are outside of the normal body code, so this helps make the size of the text sensible */
 .tipsy {
 	font-size: 130%;
-}
\ No newline at end of file
+}
-- 
2.20.1