From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 23 Feb 2012 00:53:29 +0000 (+0000)
Subject: * (bug 33045) Use locally-sourced spinner image for mediawiki.feedback module instead... 
X-Git-Tag: 1.31.0-rc.0~24561
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=8fd74954c4a41b0dda66466e0e84b0242a1d32a6;p=lhc%2Fweb%2Fwiklou.git

* (bug 33045) Use locally-sourced spinner image for mediawiki.feedback module instead of Commons image

Switched from an <img> with a hardcoded Commons link to a <span>, a stylesheet, and a locally-hosted copy of the image.
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 081eb97a26..124f460805 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -554,6 +554,7 @@ return array(
 	),
 	'mediawiki.feedback' => array(
 		'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
+		'styles' => 'resources/mediawiki/mediawiki.feedback.css',
 		'dependencies' => array( 
 			'mediawiki.api.edit', 
 			'mediawiki.Title',
diff --git a/resources/mediawiki/mediawiki.feedback.css b/resources/mediawiki/mediawiki.feedback.css
new file mode 100644
index 0000000000..531c51dfa5
--- /dev/null
+++ b/resources/mediawiki/mediawiki.feedback.css
@@ -0,0 +1,6 @@
+.feedback-spinner {
+	display: inline-block;
+	background: url(mediawiki.feedback.spinner.gif);
+	width: 18px;
+	height: 18px;
+}
diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index e96d8c711a..9a4a729827 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -106,7 +106,7 @@
 					$( '<div class="feedback-mode feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append(
 						mw.msg( 'feedback-adding' ),
 						$( '<br/>' ),
-						$( '<img src="//upload.wikimedia.org/wikipedia/commons/4/42/Loading.gif" />' )
+						$( '<span class="feedback-spinner"></span>' )
 					),
 					$( '<div class="feedback-mode feedback-thanks" style="text-align:center;margin:1em"></div>' ).msg(
 						'feedback-thanks', _this.title.getNameText(), $feedbackPageLink.clone()
diff --git a/resources/mediawiki/mediawiki.feedback.spinner.gif b/resources/mediawiki/mediawiki.feedback.spinner.gif
new file mode 100644
index 0000000000..aed0ea41f5
Binary files /dev/null and b/resources/mediawiki/mediawiki.feedback.spinner.gif differ