From: Timo Tijhof <krinklemail@gmail.com>
Date: Mon, 6 Jun 2016 18:12:49 +0000 (+0100)
Subject: resourceloader: Create 'site.styles' module
X-Git-Tag: 1.31.0-rc.0~6596
X-Git-Url: http://git.cyclocoop.org/%27-%20%20.%20url_absolue%28find_in_path%28%27spip_style.css%27%29%29%20%20%20.%20url_absolue%28find_in_path%28%27prive/spip_style.css%27%29%29%20.%20%27?a=commitdiff_plain;h=93ed259cf3e52a4f5e192c233b2df56d88a0e14c;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Create 'site.styles' module

First step in migration for 'site' module per T92459.

Bug: T92459
Change-Id: Ic137cb494ba238facba4033f9c68a35e64f4916c
---

diff --git a/autoload.php b/autoload.php
index f40cc89434..e729b6f9f1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1148,6 +1148,7 @@ $wgAutoloadLocalClasses = [
 	'ResourceLoaderOOUIImageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderOOUIImageModule.php',
 	'ResourceLoaderRawFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderRawFileModule.php',
 	'ResourceLoaderSiteModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSiteModule.php',
+	'ResourceLoaderSiteStylesModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSiteStylesModule.php',
 	'ResourceLoaderSkinModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSkinModule.php',
 	'ResourceLoaderSpecialCharacterDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php',
 	'ResourceLoaderStartUpModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderStartUpModule.php',
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ad7c97603b..53c70d8554 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3659,7 +3659,7 @@ class OutputPage extends ContextSource {
 		$moduleStyles = $this->getModuleStyles();
 
 		// Per-site custom styles
-		$moduleStyles[] = 'site';
+		$moduleStyles[] = 'site.styles';
 		$moduleStyles[] = 'noscript';
 
 		// Per-user custom styles
diff --git a/includes/resourceloader/ResourceLoaderSiteStylesModule.php b/includes/resourceloader/ResourceLoaderSiteStylesModule.php
new file mode 100644
index 0000000000..6896ad79e1
--- /dev/null
+++ b/includes/resourceloader/ResourceLoaderSiteStylesModule.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ResourceLoader module for site style customizations.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Trevor Parscal
+ * @author Roan Kattouw
+ */
+
+/**
+ * Module for site style customizations
+ */
+class ResourceLoaderSiteStylesModule extends ResourceLoaderWikiModule {
+
+	/**
+	 * Get list of pages used by this module
+	 *
+	 * @param ResourceLoaderContext $context
+	 * @return array List of pages
+	 */
+	protected function getPages( ResourceLoaderContext $context ) {
+		$pages = [];
+		if ( $this->getConfig()->get( 'UseSiteCss' ) ) {
+			$pages['MediaWiki:Common.css'] = [ 'type' => 'style' ];
+			$pages['MediaWiki:' . ucfirst( $context->getSkin() ) . '.css'] = [ 'type' => 'style' ];
+			$pages['MediaWiki:Print.css'] = [ 'type' => 'style', 'media' => 'print' ];
+
+		}
+		return $pages;
+	}
+}
diff --git a/resources/Resources.php b/resources/Resources.php
index 8130b26c33..150b8d319c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -33,6 +33,7 @@ return [
 
 	// Scripts managed by the local wiki (stored in the MediaWiki namespace)
 	'site' => [ 'class' => 'ResourceLoaderSiteModule' ],
+	'site.styles' => [ 'class' => 'ResourceLoaderSiteStylesModule' ],
 	'noscript' => [
 		'class' => 'ResourceLoaderWikiModule',
 		'styles' => [ 'MediaWiki:Noscript.css' ],