Skip to content

Commit

Permalink
Remove several ancient skins
Browse files Browse the repository at this point in the history
Standard, Simple, Chick and MySkin have all been removed.
Nostalgia has been moved to an extension for posterity.

Change-Id: Ia6d73c2deb9428d214b7d69b29235094de75c52e
  • Loading branch information
Chad Horohoe committed Apr 1, 2013
1 parent d2feb57 commit 8dfd474
Show file tree
Hide file tree
Showing 23 changed files with 3 additions and 1,747 deletions.
2 changes: 2 additions & 0 deletions RELEASE-NOTES-1.22
Expand Up @@ -25,6 +25,8 @@ changes to languages because of Bugzilla reports.

=== Other changes in 1.22 ===
* redirect.php was removed. It was unused.
* BREAKING CHANGE: Legacy skins Simple, MySkin and Standard were all removed.
Nostalgia was moved to an extension.

== Compatibility ==

Expand Down
9 changes: 0 additions & 9 deletions includes/AutoLoader.php
Expand Up @@ -156,7 +156,6 @@
'LCStore_CDB' => 'includes/cache/LocalisationCache.php',
'LCStore_DB' => 'includes/cache/LocalisationCache.php',
'LCStore_Null' => 'includes/cache/LocalisationCache.php',
'LegacyTemplate' => 'includes/SkinLegacy.php',
'License' => 'includes/Licenses.php',
'Licenses' => 'includes/Licenses.php',
'Linker' => 'includes/Linker.php',
Expand Down Expand Up @@ -229,7 +228,6 @@
'SiteStatsInit' => 'includes/SiteStats.php',
'SiteStatsUpdate' => 'includes/SiteStats.php',
'Skin' => 'includes/Skin.php',
'SkinLegacy' => 'includes/SkinLegacy.php',
'SkinTemplate' => 'includes/SkinTemplate.php',
'SpecialCreateAccount' => 'includes/SpecialPage.php',
'SpecialListAdmins' => 'includes/SpecialPage.php',
Expand Down Expand Up @@ -1089,17 +1087,10 @@
'CologneBlueTemplate' => 'skins/CologneBlue.php',
'ModernTemplate' => 'skins/Modern.php',
'MonoBookTemplate' => 'skins/MonoBook.php',
'NostalgiaTemplate' => 'skins/Nostalgia.php',
'SkinChick' => 'skins/Chick.php',
'SkinCologneBlue' => 'skins/CologneBlue.php',
'SkinModern' => 'skins/Modern.php',
'SkinMonoBook' => 'skins/MonoBook.php',
'SkinMySkin' => 'skins/MySkin.php',
'SkinNostalgia' => 'skins/Nostalgia.php',
'SkinSimple' => 'skins/Simple.php',
'SkinStandard' => 'skins/Standard.php',
'SkinVector' => 'skins/Vector.php',
'StandardTemplate' => 'skins/Standard.php',
'VectorTemplate' => 'skins/Vector.php',
);

Expand Down
1 change: 0 additions & 1 deletion includes/Skin.php
Expand Up @@ -131,7 +131,6 @@ static function normalizeKey( $key ) {
// in the user preferences.
$fallback = array(
0 => $wgDefaultSkin,
1 => 'nostalgia',
2 => 'cologneblue'
);

Expand Down
2 changes: 1 addition & 1 deletion includes/installer/LocalSettingsGenerator.php
Expand Up @@ -335,7 +335,7 @@ protected function getDefaultText() {
\$wgUpgradeKey = \"{$this->values['wgUpgradeKey']}\";
## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
## names, ie 'cologneblue', 'monobook', 'vector':
\$wgDefaultSkin = \"{$this->values['wgDefaultSkin']}\";
## For attaching licensing metadata to pages, and displaying an
Expand Down
15 changes: 0 additions & 15 deletions languages/messages/MessagesEn.php
Expand Up @@ -3692,13 +3692,8 @@ function, the specified revision does not exist, or you are attempting to hide t

# Stylesheets
'common.css' => '/* CSS placed here will be applied to all skins */', # only translate this message to other languages if you have to change it
'standard.css' => '/* CSS placed here will affect users of the Standard skin */', # only translate this message to other languages if you have to change it
'nostalgia.css' => '/* CSS placed here will affect users of the Nostalgia skin */', # only translate this message to other languages if you have to change it
'cologneblue.css' => '/* CSS placed here will affect users of the Cologne Blue skin */', # only translate this message to other languages if you have to change it
'monobook.css' => '/* CSS placed here will affect users of the MonoBook skin */', # only translate this message to other languages if you have to change it
'myskin.css' => '/* CSS placed here will affect users of the MySkin skin */', # only translate this message to other languages if you have to change it
'chick.css' => '/* CSS placed here will affect users of the Chick skin */', # only translate this message to other languages if you have to change it
'simple.css' => '/* CSS placed here will affect users of the Simple skin */', # only translate this message to other languages if you have to change it
'modern.css' => '/* CSS placed here will affect users of the Modern skin */', # only translate this message to other languages if you have to change it
'vector.css' => '/* CSS placed here will affect users of the Vector skin */', # only translate this message to other languages if you have to change it
'print.css' => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it
Expand All @@ -3711,13 +3706,8 @@ function, the specified revision does not exist, or you are attempting to hide t

# Scripts
'common.js' => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it
'standard.js' => '/* Any JavaScript here will be loaded for users using the Standard skin */', # only translate this message to other languages if you have to change it
'nostalgia.js' => '/* Any JavaScript here will be loaded for users using the Nostalgia skin */', # only translate this message to other languages if you have to change it
'cologneblue.js' => '/* Any JavaScript here will be loaded for users using the Cologne Blue skin */', # only translate this message to other languages if you have to change it
'monobook.js' => '/* Any JavaScript here will be loaded for users using the MonoBook skin */', # only translate this message to other languages if you have to change it
'myskin.js' => '/* Any JavaScript here will be loaded for users using the MySkin skin */', # only translate this message to other languages if you have to change it
'chick.js' => '/* Any JavaScript here will be loaded for users using the Chick skin */', # only translate this message to other languages if you have to change it
'simple.js' => '/* Any JavaScript here will be loaded for users using the Simple skin */', # only translate this message to other languages if you have to change it
'modern.js' => '/* Any JavaScript here will be loaded for users using the Modern skin */', # only translate this message to other languages if you have to change it
'vector.js' => '/* Any JavaScript here will be loaded for users using the Vector skin */', # only translate this message to other languages if you have to change it
'group-autoconfirmed.js' => '/* Any JavaScript here will be loaded for autoconfirmed users only */', # only translate this message to other languages if you have to change it
Expand Down Expand Up @@ -3800,13 +3790,8 @@ function, the specified revision does not exist, or you are attempting to hide t
'pageinfo-category-files' => 'Number of files',

# Skin names
'skinname-standard' => 'Classic', # only translate this message to other languages if you have to change it
'skinname-nostalgia' => 'Nostalgia', # only translate this message to other languages if you have to change it
'skinname-cologneblue' => 'Cologne Blue', # only translate this message to other languages if you have to change it
'skinname-monobook' => 'MonoBook', # only translate this message to other languages if you have to change it
'skinname-myskin' => 'MySkin', # only translate this message to other languages if you have to change it
'skinname-chick' => 'Chick', # only translate this message to other languages if you have to change it
'skinname-simple' => 'Simple', # only translate this message to other languages if you have to change it
'skinname-modern' => 'Modern', # only translate this message to other languages if you have to change it
'skinname-vector' => 'Vector', # only translate this message to other languages if you have to change it

Expand Down
21 changes: 0 additions & 21 deletions resources/Resources.php
Expand Up @@ -60,12 +60,6 @@
*
* See Vector for an example.
*/

'skins.chick' => array(
'styles' => array( 'chick/main.css' => array( 'media' => 'screen, handheld' ) ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.cologneblue' => array(
'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
Expand All @@ -89,21 +83,6 @@
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.nostalgia' => array(
'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.simple' => array(
'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.standard' => array(
'styles' => array( 'standard/main.css' => array( 'media' => 'screen' ) ),
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
),
'skins.vector' => array(
// Keep in sync with WebInstallerOutput::getCSS()
'styles' => array(
Expand Down
47 changes: 0 additions & 47 deletions skins/Chick.php

This file was deleted.

35 changes: 0 additions & 35 deletions skins/MySkin.php

This file was deleted.

147 changes: 0 additions & 147 deletions skins/Nostalgia.php

This file was deleted.

0 comments on commit 8dfd474

Please sign in to comment.