[MediaWiki-CVS] SVN: [112174] branches/wmf/1.19wmf1

Wed, 22 Feb 2012 17:02:44 -0800 

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112174

Revision: 112174
Author:   reedy
Date:     2012-02-23 01:02:38 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
MFT r112169, r112172, r112173

Modified Paths:
--------------
    branches/wmf/1.19wmf1/resources/Resources.php
    branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.js

Added Paths:
-----------
    branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css
    branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.spinner.gif

Property Changed:
----------------
    branches/wmf/1.19wmf1/
    branches/wmf/1.19wmf1/resources/Resources.php


Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152
   + /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173

Modified: branches/wmf/1.19wmf1/resources/Resources.php
===================================================================
--- branches/wmf/1.19wmf1/resources/Resources.php       2012-02-23 01:00:06 UTC 
(rev 112173)
+++ branches/wmf/1.19wmf1/resources/Resources.php       2012-02-23 01:02:38 UTC 
(rev 112174)
@@ -546,6 +546,7 @@
        ),
        'mediawiki.feedback' => array(
                'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
+               'styles' => 'resources/mediawiki/mediawiki.feedback.css',
                'dependencies' => array( 
                        'mediawiki.api.edit', 
                        'mediawiki.Title',


Property changes on: branches/wmf/1.19wmf1/resources/Resources.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/JSTesting/resources/Resources.php:100352-107913
/branches/REL1_15/phase3/resources/Resources.php:51646
/branches/REL1_17/phase3/resources/Resources.php:81445,81448
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.18wmf1/resources/Resources.php:97508,111667
/trunk/phase3/resources/Resources.php:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111809
   + /branches/JSTesting/resources/Resources.php:100352-107913
/branches/REL1_15/phase3/resources/Resources.php:51646
/branches/REL1_17/phase3/resources/Resources.php:81445,81448
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.18wmf1/resources/Resources.php:97508,111667
/trunk/phase3/resources/Resources.php:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111673,111695,111697,111750,111809,112172

Copied: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css (from 
rev 112172, trunk/phase3/resources/mediawiki/mediawiki.feedback.css)
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css            
                (rev 0)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.css    
2012-02-23 01:02:38 UTC (rev 112174)
@@ -0,0 +1,7 @@
+.feedback-spinner {
+       display: inline-block;
+       /* @embed */
+       background: url(mediawiki.feedback.spinner.gif);
+       width: 18px;
+       height: 18px;
+}

Modified: branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.js
===================================================================
--- branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.js     
2012-02-23 01:00:06 UTC (rev 112173)
+++ branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.js     
2012-02-23 01:02:38 UTC (rev 112174)
@@ -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="http://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()

Copied: 
branches/wmf/1.19wmf1/resources/mediawiki/mediawiki.feedback.spinner.gif (from 
rev 112172, trunk/phase3/resources/mediawiki/mediawiki.feedback.spinner.gif)
===================================================================
(Binary files differ)


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to