Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226600
Change subject: empty php entry point
......................................................................
empty php entry point
Change-Id: Ide1bfaeccd17433a1b7a3f4ead9b313a59bbaf77
---
M BlueSky.php
M resources/css/home.css
M resources/css/main.less
M resources/css/theme/colors/blue.less
M skin.json
5 files changed, 18 insertions(+), 177 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSky
refs/changes/00/226600/1
diff --git a/BlueSky.php b/BlueSky.php
index de8c6ff..098aa17 100644
--- a/BlueSky.php
+++ b/BlueSky.php
@@ -13,181 +13,20 @@
*
* To install place the BlueSky folder (the folder containing this file!) into
* skins/ and add this line to your wiki's LocalSettings.php:
- * require_once("$IP/skins/BlueSky/BlueSky.php");
+ * wfLoadSkin( 'BlueSky' );
*/
-// Skin credits that will show up on Special:Version
-$wgExtensionCredits['skin'][] = array(
- 'path' => __FILE__,
- 'name' => 'BlueSky',
- 'version' => '1.1',
- 'author' => array( 'wikiHow', 'Jack Phoenix' ),
- // @todo To be moved into the i18n file eventually once i18n is stable
enough.
- // No need to cause translators unnecessary extra work before I finalize
- // the description. (Suggestions for a better desc? Let me know!)
- 'description' => 'Skin based on the current version (late 2013-) of
wikiHow\'s skin',
- 'url' => 'https://www.mediawiki.org/wiki/Skin:BlueSky',
-);
+// Soup has been moved to the skin.json. All comments have been removed
because json is dumb.
-// The first instance must be strtolower()ed so that useskin=bluesky works and
-// so that it does *not* force an initial capital (i.e. we do NOT want
-// useskin=Bluesky) and the second instance is used to determine the name of
-// *this* file.
-$wgValidSkinNames['bluesky'] = 'BlueSky';
-
-// Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader)
-$wgAutoloadClasses['SkinBlueSky'] = __DIR__ . '/BlueSky.skin.php';
-$wgAutoloadClasses['BlueSkyTemplate'] = __DIR__ . '/BlueSky.skin.php';
-$wgAutoloadClasses['SkinBlueSkyHooks'] = __DIR__ . '/BlueSky.hooks.php';
-
-$wgMessagesDirs['SkinBlueSky'] = __DIR__ . '/i18n';
-
-// Main CSS ResourceLoader module
-$wgResourceModules['skins.bluesky'] = array(
- 'styles' => array(
- // MonoBook also loads these
- 'resources/src/mediawiki.skinning/interface.css' => array(
'media' => 'screen' ),
- // Styles custom to this skin
- 'skins/BlueSky/resources/css/nonarticle.css' => array( 'media'
=> 'screen' ),
- 'skins/BlueSky/resources/css/searchresults.css' => array(
'media' => 'screen' ),
- 'skins/BlueSky/resources/css/special.css' => array( 'media' =>
'screen' ),
- 'skins/BlueSky/resources/css/printable.css' => array( 'media'
=> 'print' ),
- #'skins/BlueSky/resources/css/iphone.css' => array( 'media' =>
'only screen and (max-device-width: 480px)' ),
- ),
- 'position' => 'top'
-);
-
-// zzz prefix is a hack to ensure that this module is loaded after the main
-// skins.bluesky module
-$wgResourceModules['zzzskins.bluesky.mainpage'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/home.css' => array( 'media' =>
'screen' ),
- ),
- 'position' => 'top'
-);
-
-// LESS versions of things that used to be PHP-side core hacks
-$wgResourceModules['skins.bluesky.hacks.general'] = array(
- 'styles' => 'skins/BlueSky/resources/css/hacks/general.less',
- 'position' => 'top'
-);
-
-// Action-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.action.delete'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.delete.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.edit'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.edit.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.history'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.history.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.action.protect'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.action.protect.less',
- 'position' => 'top'
-);
-
-// Namespace-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.filepage'] = array(
- 'styles' => 'skins/BlueSky/resources/css/hacks/mediawiki.filepage.less',
- 'position' => 'top'
-);
-
-// (Special) page-specific LESS hacks
-$wgResourceModules['skins.bluesky.hacks.special.log'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.log.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.special.movepage'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.movepage.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.special.recentchanges'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.recentchanges.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.special.undelete'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.undelete.less',
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.hacks.special.watchlist'] = array(
- 'styles' =>
'skins/BlueSky/resources/css/hacks/mediawiki.special.watchlist.less',
- 'position' => 'top'
-);
-
-// Themes
-// The 'themeloader.' prefix is a hack around
https://bugzilla.wikimedia.org/show_bug.cgi?id=66508
-$wgResourceModules['themeloader.skins.bluesky.blue'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/theme/blue.less' => array( 'media'
=> 'screen' )
- ),
- 'position' => 'top'
-);
-
-$wgResourceModules['themeloader.skins.bluesky.green'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/theme/green.less' => array(
'media' => 'screen' )
- ),
- 'position' => 'top'
-);
-
-$wgResourceModules['themeloader.skins.bluesky.grey'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/theme/grey.less' => array( 'media'
=> 'screen' )
- ),
- 'position' => 'top'
-);
-
-$wgResourceModules['themeloader.skins.bluesky.red'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/theme/red.less' => array( 'media'
=> 'screen' )
- ),
- 'position' => 'top'
-);
-
-$wgResourceModules['themeloader.skins.bluesky.white'] = array(
- 'styles' => array(
- 'skins/BlueSky/resources/css/theme/white.less' => array(
'media' => 'screen' )
- ),
- 'position' => 'top'
-);
-
-$wgResourceModules['skins.bluesky.js.easing'] = array(
- 'scripts' => 'skins/BlueSky/resources/js/jquery.easing.js',
- 'position' => 'top'
-);
-
-// Main JS module for this skin
-$wgResourceModules['skins.bluesky.js'] = array(
- 'scripts' => array(
- // not ready yet
- #'skins/BlueSky/resources/js/social.js',
- 'skins/BlueSky/resources/js/bluesky.js',
- ),
- 'messages' => array(
- 'navlist_collapse', 'navlist_expand',
- 'userlogin-yourname-ph', 'userlogin-yourpassword-ph',
- 'bluesky-js-no-thanks'
- ),
- 'dependencies' => array(
- 'jquery.client',
- 'skins.bluesky.js.easing',
- // for the e-mail to a friend stuff (well, at least as long as
it's
- // there...)
- 'jquery.ui.dialog'
- )
-);
-
-$wgBlueSkyTOC = '';
-
-$wgHooks['OutputPageParserOutput'][] = 'SkinBlueSkyHooks::wfTOCCrap';
\ No newline at end of file
+if ( function_exists( 'wfLoadSkin' ) ) {
+ wfLoadSkin( 'BlueSky' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['BlueSky'] = __DIR__ . '/i18n';
+ wfWarn(
+ 'Deprecated PHP entry point used for BlueSky skin. Please use
wfLoadSkin instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ );
+ return;
+} else {
+ die( 'This version of the BlueSky skin requires MediaWiki 1.25+' );
+}
diff --git a/resources/css/home.css b/resources/css/home.css
old mode 100755
new mode 100644
diff --git a/resources/css/main.less b/resources/css/main.less
old mode 100755
new mode 100644
diff --git a/resources/css/theme/colors/blue.less
b/resources/css/theme/colors/blue.less
old mode 100755
new mode 100644
diff --git a/skin.json b/skin.json
index 2a15164..c43a10f 100644
--- a/skin.json
+++ b/skin.json
@@ -197,8 +197,10 @@
"skins.bluesky.js.easing"
],
"messages": [
- "navlist_collapse", "navlist_expand",
- "userlogin-yourname-ph",
"userlogin-yourpassword-ph",
+ "navlist_collapse",
+ "navlist_expand",
+ "userlogin-yourname-ph",
+ "userlogin-yourpassword-ph",
"bluesky-js-no-thanks"
],
"scripts": [
--
To view, visit https://gerrit.wikimedia.org/r/226600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide1bfaeccd17433a1b7a3f4ead9b313a59bbaf77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSky
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
