| Index: trunk/phase3/skins/CologneBlue.php |
| — | — | @@ -17,10 +17,6 @@ |
| 18 | 18 | */ |
| 19 | 19 | class SkinCologneBlue extends Skin { |
| 20 | 20 | |
| 21 | | - function getStylesheet() { |
| 22 | | - return 'common/cologneblue.css'; |
| 23 | | - } |
| 24 | | - |
| 25 | 21 | function getSkinName() { |
| 26 | 22 | return 'cologneblue'; |
| 27 | 23 | } |
| — | — | @@ -31,17 +27,17 @@ |
| 32 | 28 | $s = "\n<div id='content'>\n<div id='topbar'>" . |
| 33 | 29 | '<table width="100%" border="0" cellspacing="0" cellpadding="8"><tr>'; |
| 34 | 30 | |
| 35 | | - $s .= '<td class="top" align="left" valign="middle" nowrap="nowrap">'; |
| | 31 | + $s .= '<td class="top" nowrap="nowrap">'; |
| 36 | 32 | $s .= '<a href="' . $mainPageObj->escapeLocalURL() . '">'; |
| 37 | 33 | $s .= '<span id="sitetitle">' . wfMsg( 'sitetitle' ) . '</span></a>'; |
| 38 | 34 | |
| 39 | | - $s .= '</td><td class="top" align="right" valign="bottom" width="100%">'; |
| | 35 | + $s .= '</td><td class="top" id="top-syslinks" width="100%">'; |
| 40 | 36 | $s .= $this->sysLinks(); |
| 41 | | - $s .= '</td></tr><tr><td valign="top">'; |
| | 37 | + $s .= '</td></tr><tr><td class="top-linkcollection">'; |
| 42 | 38 | |
| 43 | 39 | $s .= '<font size="-1"><span id="sitesub">'; |
| 44 | 40 | $s .= htmlspecialchars( wfMsg( 'sitesubtitle' ) ) . '</span></font>'; |
| 45 | | - $s .= '</td><td align="right">'; |
| | 41 | + $s .= '</td><td class="top-linkcollection">'; |
| 46 | 42 | |
| 47 | 43 | $s .= '<font size="-1"><span id="langlinks">'; |
| 48 | 44 | $s .= str_replace( '<br />', '', $this->otherLanguages() ); |
| — | — | @@ -77,7 +73,7 @@ |
| 78 | 74 | if ( 1 == $qb || 3 == $qb ) { # Left |
| 79 | 75 | $s .= $this->getQuickbarCompensator(); |
| 80 | 76 | } |
| 81 | | - $s .= '<td class="bottom" align="center" valign="top">'; |
| | 77 | + $s .= '<td class="bottom">'; |
| 82 | 78 | |
| 83 | 79 | $s .= $this->bottomLinks(); |
| 84 | 80 | $s .= $wgLang->pipeList( array( |
| — | — | @@ -107,6 +103,9 @@ |
| 108 | 104 | } |
| 109 | 105 | |
| 110 | 106 | function setupSkinUserCss( OutputPage $out ){ |
| | 107 | + parent::setupSkinUserCss( $out ); |
| | 108 | + $out->addModuleStyles( 'skins.cologneblue' ); |
| | 109 | + |
| 111 | 110 | global $wgContLang; |
| 112 | 111 | $qb = $this->qbSetting(); |
| 113 | 112 | $rules = array(); |
| — | — | @@ -133,7 +132,6 @@ |
| 134 | 133 | $style = CSSJanus::transform( $style, true, false ); |
| 135 | 134 | } |
| 136 | 135 | $out->addInlineStyle( $style ); |
| 137 | | - parent::setupSkinUserCss( $out ); |
| 138 | 136 | } |
| 139 | 137 | |
| 140 | 138 | function sysLinks() { |
| Index: trunk/phase3/skins/Standard.php |
| — | — | @@ -20,6 +20,9 @@ |
| 21 | 21 | * |
| 22 | 22 | */ |
| 23 | 23 | function setupSkinUserCss( OutputPage $out ){ |
| | 24 | + parent::setupSkinUserCss( $out ); |
| | 25 | + $out->AddModuleStyles( 'skins.standard' ); |
| | 26 | + |
| 24 | 27 | global $wgContLang; |
| 25 | 28 | $qb = $this->qbSetting(); |
| 26 | 29 | $rules = array(); |
| — | — | @@ -43,7 +46,6 @@ |
| 44 | 47 | $style = CSSJanus::transform( $style, true, false ); |
| 45 | 48 | } |
| 46 | 49 | $out->addInlineStyle( $style ); |
| 47 | | - parent::setupSkinUserCss( $out ); |
| 48 | 50 | } |
| 49 | 51 | |
| 50 | 52 | function doAfterContent() { |
| — | — | @@ -61,9 +63,6 @@ |
| 62 | 64 | $qb = $this->qbSetting(); |
| 63 | 65 | $shove = ( $qb != 0 ); |
| 64 | 66 | $left = ( $qb == 1 || $qb == 3 ); |
| 65 | | - if( $wgContLang->isRTL() ) { |
| 66 | | - $left = !$left; |
| 67 | | - } |
| 68 | 67 | |
| 69 | 68 | if ( $shove && $left ) { # Left |
| 70 | 69 | $s .= $this->getQuickbarCompensator(); |
| Index: trunk/phase3/skins/common/cologneblue.css |
| — | — | @@ -96,10 +96,20 @@ |
| 97 | 97 | font-size: 10pt; |
| 98 | 98 | } |
| 99 | 99 | |
| | 100 | +td#top-syslinks { |
| | 101 | + text-align: right; |
| | 102 | + vertical-align: bottom; |
| | 103 | +} |
| | 104 | +td.top-linkcollection { |
| | 105 | + text-align: right; |
| | 106 | +} |
| | 107 | + |
| 100 | 108 | td.bottom { |
| 101 | 109 | font-family: Verdana, Arial, sans-serif; |
| 102 | 110 | font-size: 10pt; |
| 103 | 111 | padding: 0; |
| | 112 | + text-align: center; |
| | 113 | + vertical-align: bottom; |
| 104 | 114 | } |
| 105 | 115 | |
| 106 | 116 | #pagestats { |
| — | — | @@ -207,4 +217,4 @@ |
| 208 | 218 | |
| 209 | 219 | input.mw-searchInput { |
| 210 | 220 | width: 106px; |
| 211 | | -} |
| \ No newline at end of file |
| | 221 | +} |
| Index: trunk/phase3/skins/common/nostalgia.css |
| — | — | @@ -46,3 +46,6 @@ |
| 47 | 47 | padding-top: 0; |
| 48 | 48 | margin-top: 0; |
| 49 | 49 | } |
| | 50 | +div.sitenotice { |
| | 51 | + clear: both; |
| | 52 | +} |
| Index: trunk/phase3/skins/Nostalgia.php |
| — | — | @@ -16,14 +16,15 @@ |
| 17 | 17 | */ |
| 18 | 18 | class SkinNostalgia extends Skin { |
| 19 | 19 | |
| 20 | | - function getStylesheet() { |
| 21 | | - return 'common/nostalgia.css'; |
| 22 | | - } |
| 23 | | - |
| 24 | 20 | function getSkinName() { |
| 25 | 21 | return 'nostalgia'; |
| 26 | 22 | } |
| 27 | 23 | |
| | 24 | + function setupSkinUserCss( OutputPage $out ){ |
| | 25 | + parent::setupSkinUserCss( $out ); |
| | 26 | + $out->addModuleStyles( 'skins.nostalgia' ); |
| | 27 | + } |
| | 28 | + |
| 28 | 29 | function doBeforeContent() { |
| 29 | 30 | $s = "\n<div id='content'>\n<div id='top'>\n"; |
| 30 | 31 | $s .= '<div id="logo">' . $this->logoText( 'right' ) . '</div>'; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -660,9 +660,6 @@ |
| 661 | 661 | function setupSkinUserCss( OutputPage $out ) { |
| 662 | 662 | $out->addModuleStyles( 'mediawiki.legacy.shared' ); |
| 663 | 663 | $out->addModuleStyles( 'mediawiki.legacy.oldshared' ); |
| 664 | | - // TODO: When converting old skins to use ResourceLoader (or removing them) the following should be reconsidered |
| 665 | | - $out->addStyle( $this->getStylesheet() ); |
| 666 | | - $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' ); |
| 667 | 664 | } |
| 668 | 665 | |
| 669 | 666 | function getPageClasses( $title ) { |
| — | — | @@ -729,10 +726,6 @@ |
| 730 | 727 | $shove = ( $qb != 0 ); |
| 731 | 728 | $left = ( $qb == 1 || $qb == 3 ); |
| 732 | 729 | |
| 733 | | - if ( $wgContLang->isRTL() ) { |
| 734 | | - $left = !$left; |
| 735 | | - } |
| 736 | | - |
| 737 | 730 | if ( !$shove ) { |
| 738 | 731 | $s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" . |
| 739 | 732 | $this->logoText() . '</td>'; |
| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -29,6 +29,15 @@ |
| 30 | 30 | 'styles' => array( 'skins/modern/main.css' => array( 'media' => 'screen' ), |
| 31 | 31 | 'skins/modern/print.css' => array( 'media' => 'print' ) ), |
| 32 | 32 | ), |
| | 33 | + 'skins.cologneblue' => array( |
| | 34 | + 'styles' => array( 'skins/common/cologneblue.css' => array( 'media' => 'screen' ) ), |
| | 35 | + ), |
| | 36 | + 'skins.nostalgia' => array( |
| | 37 | + 'styles' => array( 'skins/common/nostalgia.css' => array( 'media' => 'screen' ) ), |
| | 38 | + ), |
| | 39 | + 'skins.standard' => array( |
| | 40 | + 'styles' => array( 'skins/common/wikistandard.css' => array( 'media' => 'screen' ) ), |
| | 41 | + ), |
| 33 | 42 | |
| 34 | 43 | /* jQuery */ |
| 35 | 44 | |