Move assets/ to resources/assets/

While it's "semantically" incorrect (these files are not
ResourceLoader resources), putting them in that subdirectory is a lot
less hassle than introducing a new toplevel directory.

Follow-up to 2b4b9a3f. Discussion that resulted in the toplevel
assets/ took place on I6268d663 (now abandoned).

Change-Id: Iedbfd802457fe35803899e3479540177760ec30b

includes/DefaultSettings.php

@@ -3102,7 +3102,7 @@ $wgFooterIcons = array(
 	),
 	"poweredby" => array(
 		"mediawiki" => array(
-			"src" => null, // Defaults to "$wgScriptPath/assets/poweredby_mediawiki_88x31.png"
+			"src" => null, // Defaults to "$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png"
 			"url" => "//www.mediawiki.org/",
 			"alt" => "Powered by MediaWiki",
 		)

includes/PHPVersionError.php

@@ -60,7 +60,7 @@ function wfPHPVersionError( $type ) {
 		}
 		$encLogo = htmlspecialchars(
 			str_replace( '//', '/', $dirname . '/' ) .
-			'assets/mediawiki.png'
+			'resources/assets/mediawiki.png'
 		);
 
 		header( "$protocol 500 MediaWiki configuration Error" );

includes/Setup.php

@@ -106,7 +106,7 @@ if ( $wgGitInfoCacheDirectory === false && $wgCacheDirectory !== false ) {
 if ( $wgRightsIcon ) {
 	$wgRightsIcon = str_replace(
 		"{$wgStylePath}/common/images/",
-		"{$wgScriptPath}/assets/licenses/",
+		"{$wgScriptPath}/resources/assets/licenses/",
 		$wgRightsIcon
 	);
 }
@@ -133,7 +133,7 @@ if ( isset( $wgFooterIcons['poweredby'] )
 	&& $wgFooterIcons['poweredby']['mediawiki']['src'] === null
 ) {
 	$wgFooterIcons['poweredby']['mediawiki']['src'] =
-		"$wgScriptPath/assets/poweredby_mediawiki_88x31.png";
+		"$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png";
 }
 
 /**

includes/filerepo/file/File.php

@@ -1329,8 +1329,8 @@ abstract class File {
 	 */
 	function iconThumb() {
 		global $wgScriptPath, $IP;
-		$assetsPath = "$wgScriptPath/assets/file-type-icons/";
+		$assetsPath = "$wgScriptPath/resources/assets/file-type-icons/";
-		$assetsDirectory = "$IP/assets/file-type-icons/";
+		$assetsDirectory = "$IP/resources/assets/file-type-icons/";
 
 		$try = array( 'fileicon-' . $this->getExtension() . '.png', 'fileicon.png' );
 		foreach ( $try as $icon ) {

includes/installer/Installer.php

@@ -286,27 +286,27 @@ abstract class Installer {
 	public $licenses = array(
 		'cc-by' => array(
 			'url' => 'http://creativecommons.org/licenses/by/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by.png',
 		),
 		'cc-by-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by-sa.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by-sa.png',
 		),
 		'cc-by-nc-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by-nc-sa.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by-nc-sa.png',
 		),
 		'cc-0' => array(
 			'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-0.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-0.png',
 		),
 		'pd' => array(
 			'url' => '',
-			'icon' => '{$wgScriptPath}/assets/licenses/public-domain.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/public-domain.png',
 		),
 		'gfdl' => array(
 			'url' => 'http://www.gnu.org/copyleft/fdl.html',
-			'icon' => '{$wgScriptPath}/assets/licenses/gnu-fdl.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/gnu-fdl.png',
 		),
 		'none' => array(
 			'url' => '',

includes/skins/Skin.php

@@ -829,7 +829,7 @@ abstract class Skin extends ContextSource {
 	function getPoweredBy() {
 		global $wgScriptPath;
 
-		$url = htmlspecialchars( "$wgScriptPath/assets/poweredby_mediawiki_88x31.png" );
+		$url = htmlspecialchars( "$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png" );
 		$text = '<a href="//www.mediawiki.org/"><img src="' . $url
 			. '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
 		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );

includes/templates/NoLocalSettings.php

@@ -72,7 +72,7 @@ if ( !function_exists( 'session_name' ) ) {
 		</style>
 	</head>
 	<body>
-		<img src="<?php echo htmlspecialchars( $path ) ?>assets/mediawiki.png" alt='The MediaWiki logo' />
+		<img src="<?php echo htmlspecialchars( $path ) ?>resources/assets/mediawiki.png" alt='The MediaWiki logo' />
 
 		<h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1>
 		<div class='error'>