From e5bb119085275add6a49669bde7f1742ee122b60 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sun, 23 Jan 2011 01:41:13 +0000 Subject: [PATCH] Port the remaining Skin.php skins standard(classic), Cologneblue and Nostalgia * Converted Nostalgia's use of inline table alignment to CSS * common_rtl.css is not in use now Refs bug 26649 --- includes/Skin.php | 7 ------- resources/Resources.php | 9 +++++++++ skins/CologneBlue.php | 18 ++++++++---------- skins/Nostalgia.php | 9 +++++---- skins/Standard.php | 7 +++---- skins/common/cologneblue.css | 12 +++++++++++- skins/common/nostalgia.css | 3 +++ 7 files changed, 39 insertions(+), 26 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index 15536c46f0..584253802f 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -660,9 +660,6 @@ class Skin extends Linker { function setupSkinUserCss( OutputPage $out ) { $out->addModuleStyles( 'mediawiki.legacy.shared' ); $out->addModuleStyles( 'mediawiki.legacy.oldshared' ); - // TODO: When converting old skins to use ResourceLoader (or removing them) the following should be reconsidered - $out->addStyle( $this->getStylesheet() ); - $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' ); } function getPageClasses( $title ) { @@ -729,10 +726,6 @@ class Skin extends Linker { $shove = ( $qb != 0 ); $left = ( $qb == 1 || $qb == 3 ); - if ( $wgContLang->isRTL() ) { - $left = !$left; - } - if ( !$shove ) { $s .= "\n" . $this->logoText() . ''; diff --git a/resources/Resources.php b/resources/Resources.php index c68ebda671..1007925663 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -29,6 +29,15 @@ return array( 'styles' => array( 'skins/modern/main.css' => array( 'media' => 'screen' ), 'skins/modern/print.css' => array( 'media' => 'print' ) ), ), + 'skins.cologneblue' => array( + 'styles' => array( 'skins/common/cologneblue.css' => array( 'media' => 'screen' ) ), + ), + 'skins.nostalgia' => array( + 'styles' => array( 'skins/common/nostalgia.css' => array( 'media' => 'screen' ) ), + ), + 'skins.standard' => array( + 'styles' => array( 'skins/common/wikistandard.css' => array( 'media' => 'screen' ) ), + ), /* jQuery */ diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index 1ff2ccab40..2fdfe878cc 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -17,10 +17,6 @@ if( !defined( 'MEDIAWIKI' ) ) { */ class SkinCologneBlue extends Skin { - function getStylesheet() { - return 'common/cologneblue.css'; - } - function getSkinName() { return 'cologneblue'; } @@ -31,17 +27,17 @@ class SkinCologneBlue extends Skin { $s = "\n
\n
" . ''; - $s .= '
'; + $s .= ''; $s .= ''; $s .= '' . wfMsg( 'sitetitle' ) . ''; - $s .= ''; + $s .= '
'; + $s .= '
'; $s .= ''; $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . ''; - $s .= ''; + $s .= ''; $s .= ''; $s .= str_replace( '
', '', $this->otherLanguages() ); @@ -77,7 +73,7 @@ class SkinCologneBlue extends Skin { if ( 1 == $qb || 3 == $qb ) { # Left $s .= $this->getQuickbarCompensator(); } - $s .= '		'; + $s .= ''; $s .= $this->bottomLinks(); $s .= $wgLang->pipeList( array( @@ -107,6 +103,9 @@ class SkinCologneBlue extends Skin { } function setupSkinUserCss( OutputPage $out ){ + parent::setupSkinUserCss( $out ); + $out->addModuleStyles( 'skins.cologneblue' ); + global $wgContLang; $qb = $this->qbSetting(); $rules = array(); @@ -133,7 +132,6 @@ class SkinCologneBlue extends Skin { $style = CSSJanus::transform( $style, true, false ); } $out->addInlineStyle( $style ); - parent::setupSkinUserCss( $out ); } function sysLinks() { diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php index 6c599b218c..5242fe326e 100644 --- a/skins/Nostalgia.php +++ b/skins/Nostalgia.php @@ -16,14 +16,15 @@ if( !defined( 'MEDIAWIKI' ) ) { */ class SkinNostalgia extends Skin { - function getStylesheet() { - return 'common/nostalgia.css'; - } - function getSkinName() { return 'nostalgia'; } + function setupSkinUserCss( OutputPage $out ){ + parent::setupSkinUserCss( $out ); + $out->addModuleStyles( 'skins.nostalgia' ); + } + function doBeforeContent() { $s = "\n
\n
\n"; $s .= ''; diff --git a/skins/Standard.php b/skins/Standard.php index 2ea6896d90..e0c009b41a 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -20,6 +20,9 @@ class SkinStandard extends Skin { * */ function setupSkinUserCss( OutputPage $out ){ + parent::setupSkinUserCss( $out ); + $out->AddModuleStyles( 'skins.standard' ); + global $wgContLang; $qb = $this->qbSetting(); $rules = array(); @@ -43,7 +46,6 @@ class SkinStandard extends Skin { $style = CSSJanus::transform( $style, true, false ); } $out->addInlineStyle( $style ); - parent::setupSkinUserCss( $out ); } function doAfterContent() { @@ -61,9 +63,6 @@ class SkinStandard extends Skin { $qb = $this->qbSetting(); $shove = ( $qb != 0 ); $left = ( $qb == 1 || $qb == 3 ); - if( $wgContLang->isRTL() ) { - $left = !$left; - } if ( $shove && $left ) { # Left $s .= $this->getQuickbarCompensator(); diff --git a/skins/common/cologneblue.css b/skins/common/cologneblue.css index c7b6eac18a..d5ed280df6 100644 --- a/skins/common/cologneblue.css +++ b/skins/common/cologneblue.css @@ -96,10 +96,20 @@ td.top a { font-size: 10pt; } +td#top-syslinks { + text-align: right; + vertical-align: bottom; +} +td.top-linkcollection { + text-align: right; +} + td.bottom { font-family: Verdana, Arial, sans-serif; font-size: 10pt; padding: 0; + text-align: center; + vertical-align: bottom; } #pagestats { @@ -207,4 +217,4 @@ small { input.mw-searchInput { width: 106px; -} \ No newline at end of file +} diff --git a/skins/common/nostalgia.css b/skins/common/nostalgia.css index e1b774dfe3..1cac7a738a 100644 --- a/skins/common/nostalgia.css +++ b/skins/common/nostalgia.css @@ -46,3 +46,6 @@ p.subtitle { padding-top: 0; margin-top: 0; } +div.sitenotice { + clear: both; +} -- 2.20.1