Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/176612
Change subject: Version 2.2.4 -- fixed for MW 1.24 ...................................................................... Version 2.2.4 -- fixed for MW 1.24 Change-Id: I089b1351e7e9d452b389e272b4130aefdd381844 --- M DeskMessMirrored.php M DeskMessMirrored.skin.php 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored refs/changes/12/176612/1 diff --git a/DeskMessMirrored.php b/DeskMessMirrored.php index 2d35f9f..5afb57e 100644 --- a/DeskMessMirrored.php +++ b/DeskMessMirrored.php @@ -8,7 +8,7 @@ * @ingroup Skins * @author Edward Caissie <[email protected]> -- original WordPress theme * @author Jack Phoenix <[email protected]> -- MediaWiki port - * @date 10 February 2014 + * @date 30 November 2014 * @see http://wordpress.org/themes/desk-mess-mirrored * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License version 2 * @@ -25,7 +25,7 @@ $wgExtensionCredits['skin'][] = array( 'path' => __FILE__, 'name' => 'Desk Mess Mirrored', - 'version' => '2.2.3', + 'version' => '2.2.4', 'author' => array( '[http://edwardcaissie.com/ Edward Caissie]', 'Jack Phoenix' ), 'descriptionmsg' => 'deskmessmirrored-skin-desc', 'url' => 'https://www.mediawiki.org/wiki/Skin:DeskMessMirrored', @@ -37,16 +37,12 @@ // *this* file. $wgValidSkinNames['deskmessmirrored'] = 'DeskMessMirrored'; -// Autoload the skin class, make it a valid skin, set up i18n, set up CSS & JS -// (via ResourceLoader) +// Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader) $wgAutoloadClasses['SkinDeskMessMirrored'] = __DIR__ . '/DeskMessMirrored.skin.php'; $wgMessagesDirs['SkinDeskMessMirrored'] = __DIR__ . '/i18n'; + $wgResourceModules['skins.deskmessmirrored'] = 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 DeskMessMirrored skin 'skins/DeskMessMirrored/css/style.css' => array( 'media' => 'screen' ) // @todo editor-style.css? Probably not needed, I guess... diff --git a/DeskMessMirrored.skin.php b/DeskMessMirrored.skin.php index d5bfb9d..3df41b5 100644 --- a/DeskMessMirrored.skin.php +++ b/DeskMessMirrored.skin.php @@ -14,7 +14,7 @@ * @ingroup Skins */ class SkinDeskMessMirrored extends SkinTemplate { - var $skinname = 'deskmessmirrored', $stylename = 'deskmessmirrored', + public $skinname = 'deskmessmirrored', $stylename = 'deskmessmirrored', $template = 'DeskMessMirroredTemplate', $useHeadElement = true; /** @@ -42,7 +42,11 @@ parent::setupSkinUserCss( $out ); // Add CSS via ResourceLoader - $out->addModuleStyles( 'skins.deskmessmirrored' ); + $out->addModuleStyles( array( + 'mediawiki.skinning.interface', + 'mediawiki.skinning.content.externallinks', + 'skins.deskmessmirrored' + ) ); // Internet Explorer fixes (required for IE11 at least) $out->addStyle( "{$wgStylePath}/DeskMessMirrored/css/ie.css", 'screen', 'IE' ); @@ -134,7 +138,7 @@ <div id="maintop"></div> <div id="wrapper"> <div id="content"> - <div id="main-blog"> + <div id="main-blog" class="mw-body"> <div class="post hentry mw-body-primary"> <?php $this->cactions(); ?> <?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div><?php } ?> @@ -295,7 +299,7 @@ foreach ( $this->getToolbox() as $key => $tbitem ) { echo $this->makeListItem( $key, $tbitem ); } - wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) ); + wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) ); echo '</ul>'; } // toolbox() -- To view, visit https://gerrit.wikimedia.org/r/176612 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I089b1351e7e9d452b389e272b4130aefdd381844 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DeskMessMirrored Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
