Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/176613
Change subject: Version 2.1 -- fixed for MW 1.24 ...................................................................... Version 2.1 -- fixed for MW 1.24 Change-Id: I5fdc87cf553bd9124d4a9e4577d1e8ae3d6eb851 --- M Dusk.php M Dusk.skin.php M resources/css/main.css 3 files changed, 13 insertions(+), 88 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Dusk refs/changes/13/176613/1 diff --git a/Dusk.php b/Dusk.php index 31d3fbd..8c7cbe2 100644 --- a/Dusk.php +++ b/Dusk.php @@ -8,7 +8,7 @@ * @author Gregory S. Hayes -- original MediaWiki skin * @author Becca Wei (http://beccary.com/) -- WordPress Dusk theme * @author Jack Phoenix <[email protected]> -- updates & modernization - * @date 6 January 2014 + * @date 30 November 2014 * * To install, place the Dusk folder (the folder containing this file!) into * skins/ and add this line to your wiki's LocalSettings.php: @@ -23,7 +23,7 @@ $wgExtensionCredits['skin'][] = array( 'path' => __FILE__, 'name' => 'Dusk', - 'version' => '2.0', + 'version' => '2.1', 'author' => array( 'Gregory S. Hayes', 'Becca Wei', 'Jack Phoenix' ), 'description' => 'Dusk MediaWiki skin, based on WordPress Dusk theme', 'url' => 'https://www.mediawiki.org/wiki/Skin:Dusk', @@ -35,15 +35,11 @@ // *this* file. $wgValidSkinNames['dusk'] = 'Dusk'; -// Autoload the skin class, make it a valid skin, set up i18n, set up CSS & JS -// (via ResourceLoader) +// Autoload the skin class and set up CSS & JS (via ResourceLoader) $wgAutoloadClasses['SkinDusk'] = __DIR__ . '/Dusk.skin.php'; + $wgResourceModules['skins.dusk'] = array( 'styles' => array( - // MonoBook also loads these - 'skins/common/commonElements.css' => array( 'media' => 'screen' ), - 'skins/common/commonContent.css' => array( 'media' => 'screen' ), - 'skins/common/commonInterface.css' => array( 'media' => 'screen' ), // Styles custom to the Dusk skin 'skins/Dusk/resources/css/main.css' => array( 'media' => 'screen' ) ), diff --git a/Dusk.skin.php b/Dusk.skin.php index db48678..a05d475 100644 --- a/Dusk.skin.php +++ b/Dusk.skin.php @@ -24,9 +24,11 @@ parent::setupSkinUserCss( $out ); // Add CSS via ResourceLoader - // Need to use addModuleStyles() instead of addModules() for proper - // RTL support...no idea *why*, though! - $out->addModuleStyles( 'skins.dusk' ); + $out->addModuleStyles( array( + 'mediawiki.skinning.interface', + 'mediawiki.skinning.content.externallinks', + 'skins.dusk' + ) ); } } @@ -43,6 +45,8 @@ * outputs a formatted page. */ public function execute() { + $this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); + $this->html( 'headelement' ); ?><div id="globalWrapper"> <div id="header"> @@ -54,10 +58,7 @@ <div id="content" class="mw-body-primary"> <a id="contentTop"></a> <?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div><?php } ?> - <h1 id="firstHeading" class="firstHeading" lang="<?php - $this->data['pageLanguage'] = $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(); - $this->text( 'pageLanguage' ); - ?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1> + <h1 id="firstHeading" class="firstHeading" lang="<?php $this->text( 'pageLanguage' ); ?>"><span dir="auto"><?php $this->html( 'title' ) ?></span></h1> <div id="bodyContent" class="mw-body"> <h3 id="siteSub"><?php $this->msg( 'tagline' ) ?></h3> <div id="contentSub"><?php $this->html( 'subtitle' ) ?></div> @@ -217,7 +218,7 @@ foreach ( $this->getToolbox() as $key => $tbitem ) { echo $this->makeListItem( $key, $tbitem ); } - wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) ); + wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) ); ?> </ul> diff --git a/resources/css/main.css b/resources/css/main.css index c358da1..8f02fff 100644 --- a/resources/css/main.css +++ b/resources/css/main.css @@ -197,74 +197,6 @@ .small, .small * { font-size: 94%; } table.small { font-size: 100% } -/* -** keep the whitespace in front of the ^=, hides rule from Konqueror -** this is CSS 3, the validator doesn't like it when validating as CSS 2 -*/ -#bodyContent a.external, -#bodyContent a.external[href ^="gopher://";] { - /* @embed */ - background: url(../../../monobook/external-ltr.png) center right no-repeat; - padding-right: 13px; -} -#bodyContent a.external[href ^="https://";], -.link-https { - /* @embed */ - background: url(../../../monobook/lock_icon.gif) center right no-repeat; - padding-right: 16px; -} -#bodyContent a.external[href ^="mailto:";], -.link-mailto { - /* @embed */ - background: url(../../../monobook/mail_icon.gif) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="news://";] { - /* @embed */ - background: url(../../../monobook/news_icon.png) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="ftp://";], -.link-ftp { - /* @embed */ - background: url(../../../monobook/file_icon.gif) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="irc://"], -.link-irc { - /* @embed */ - background: url(../../../monobook/discussionitem_icon.gif) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href $=".ogg"], #bodyContent a.external[href $=".OGG"], -#bodyContent a.external[href $=".mid"], #bodyContent a.external[href $=".MID"], -#bodyContent a.external[href $=".midi"], #bodyContent a.external[href $=".MIDI"], -#bodyContent a.external[href $=".mp3"], #bodyContent a.external[href $=".MP3"], -#bodyContent a.external[href $=".wav"], #bodyContent a.external[href $=".WAV"], -#bodyContent a.external[href $=".wma"], #bodyContent a.external[href $=".WMA"], -.link-audio { - /* @embed */ - background: url("../../../monobook/audio.png") center right no-repeat; - padding-right: 13px; -} -#bodyContent a.external[href $=".ogm"], #bodyContent a.external[href $=".OGM"], -#bodyContent a.external[href $=".avi"], #bodyContent a.external[href $=".AVI"], -#bodyContent a.external[href $=".mpeg"], #bodyContent a.external[href $=".MPEG"], -#bodyContent a.external[href $=".mpg"], #bodyContent a.external[href $=".MPG"], -.link-video { - /* @embed */ - background: url("../../../monobook/video.png") center right no-repeat; - padding-right: 13px; -} -#bodyContent a.external[href $=".pdf"], #bodyContent a.external[href $=".PDF"], -#bodyContent a.external[href *=".pdf#"], #bodyContent a.external[href *=".PDF#"], -#bodyContent a.external[href *=".pdf?"], #bodyContent a.external[href *=".PDF?"], -.link-document { - /* @embed */ - background: url("../../../monobook/document.png") center right no-repeat; - padding-right: 12px; -} - /* disable interwiki styling */ #bodyContent a.extiw, #bodyContent a.extiw:active { @@ -561,10 +493,6 @@ .clearfix { display: inline-block; } - -/* Hides from IE-mac \*/ -* html .clearfix { height: 1%; } -/* End hide from IE-mac */ /** Comments */ div#allcomments .full, -- To view, visit https://gerrit.wikimedia.org/r/176613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5fdc87cf553bd9124d4a9e4577d1e8ae3d6eb851 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Dusk Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
