From 3ac76433b39615b77bc7a2b8d93857523b14f802 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Sat, 25 May 2013 11:24:42 +0200 Subject: [PATCH] mediawiki.icon: Move arrow icons to a separate module The arrow icons for the enhanced watchlist/recent changes could be useful elsewhere. But to do that, we need to be able to load them separately; this does that by adding a new module just for the CSS needed for the arrows. Also, this fixes a use of OutputPage::addModuleStyles that really should have been OutputPage::addModules so dependencies are resolved. Change-Id: I639a5ccbc3b7b2794e7b12ecb64e5ee6b10a640a --- includes/ChangesList.php | 6 +++--- resources/Resources.php | 5 ++++- .../mediawiki.special.changeslist.css | 10 ---------- .../images/arrow-collapsed-ltr.png | Bin .../images/arrow-collapsed-rtl.png | Bin .../images/arrow-expanded.png | Bin resources/mediawiki/mediawiki.icon.css | 15 +++++++++++++++ 7 files changed, 22 insertions(+), 14 deletions(-) rename resources/{mediawiki.special => mediawiki}/images/arrow-collapsed-ltr.png (100%) rename resources/{mediawiki.special => mediawiki}/images/arrow-collapsed-rtl.png (100%) rename resources/{mediawiki.special => mediawiki}/images/arrow-expanded.png (100%) create mode 100644 resources/mediawiki/mediawiki.icon.css diff --git a/includes/ChangesList.php b/includes/ChangesList.php index 796b92ad0a..f2b52860f4 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -194,7 +194,7 @@ class ChangesList extends ContextSource { $this->rcCacheIndex = 0; $this->lastdate = ''; $this->rclistOpen = false; - $this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' ); + $this->getOutput()->addModules( 'mediawiki.special.changeslist' ); return ''; } @@ -703,7 +703,7 @@ class EnhancedChangesList extends ChangesList { $this->rcCacheIndex = 0; $this->lastdate = ''; $this->rclistOpen = false; - $this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' ); + $this->getOutput()->addModules( 'mediawiki.special.changeslist' ); return ''; } /** @@ -940,7 +940,7 @@ class EnhancedChangesList extends ChangesList { implode( $this->message['semicolon-separator'], $users ) )->escaped() . ''; - $tl = ''; + $tl = ''; $r .= "$tl"; # Main line diff --git a/resources/Resources.php b/resources/Resources.php index 7361b725b9..fb4d46b971 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -596,6 +596,9 @@ return array( 'user.tokens', ), ), + 'mediawiki.icon' => array( + 'styles' => 'resources/mediawiki/mediawiki.icon.css', + ), 'mediawiki.debug' => array( 'scripts' => 'resources/mediawiki/mediawiki.debug.js', 'styles' => 'resources/mediawiki/mediawiki.debug.css', @@ -903,7 +906,7 @@ return array( ), 'mediawiki.special.changeslist' => array( 'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css', - 'dependencies' => array( 'jquery.makeCollapsible' ), + 'dependencies' => array( 'jquery.makeCollapsible', 'mediawiki.icon' ), ), 'mediawiki.special.movePage' => array( 'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js', diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css b/resources/mediawiki.special/mediawiki.special.changeslist.css index 3c841e5bf7..7b3740eb57 100644 --- a/resources/mediawiki.special/mediawiki.special.changeslist.css +++ b/resources/mediawiki.special/mediawiki.special.changeslist.css @@ -49,16 +49,6 @@ table.mw-enhanced-rc td.mw-enhanced-rc-nested { cursor: pointer; } -.mw-enhancedchanges-arrow.mw-collapsible-toggle-collapsed { - /* @embed */ - background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom; -} - -.mw-enhancedchanges-arrow.mw-collapsible-toggle-expanded { - /* @embed */ - background: url(images/arrow-expanded.png) no-repeat left bottom; -} - .mw-changeslist-line-watched .mw-title, .mw-enhanced-watched .mw-enhanced-rc-time { font-weight: bold; diff --git a/resources/mediawiki.special/images/arrow-collapsed-ltr.png b/resources/mediawiki/images/arrow-collapsed-ltr.png similarity index 100% rename from resources/mediawiki.special/images/arrow-collapsed-ltr.png rename to resources/mediawiki/images/arrow-collapsed-ltr.png diff --git a/resources/mediawiki.special/images/arrow-collapsed-rtl.png b/resources/mediawiki/images/arrow-collapsed-rtl.png similarity index 100% rename from resources/mediawiki.special/images/arrow-collapsed-rtl.png rename to resources/mediawiki/images/arrow-collapsed-rtl.png diff --git a/resources/mediawiki.special/images/arrow-expanded.png b/resources/mediawiki/images/arrow-expanded.png similarity index 100% rename from resources/mediawiki.special/images/arrow-expanded.png rename to resources/mediawiki/images/arrow-expanded.png diff --git a/resources/mediawiki/mediawiki.icon.css b/resources/mediawiki/mediawiki.icon.css new file mode 100644 index 0000000000..f61b72578a --- /dev/null +++ b/resources/mediawiki/mediawiki.icon.css @@ -0,0 +1,15 @@ +/* General-purpose icons via CSS. Classes here should be named "mw-icon-*". */ + +/* For the collapsed and expanded arrows, we also provide selectors to make it + * easy to use them with jquery.makeCollapsible. */ +.mw-icon-arrow-collapsed, +.mw-collapsible-arrow.mw-collapsible-toggle-collapsed { + /* @embed */ + background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom; +} + +.mw-icon-arrow-expanded, +.mw-collapsible-arrow.mw-collapsible-toggle-expanded { + /* @embed */ + background: url(images/arrow-expanded.png) no-repeat left bottom; +} -- 2.20.1