http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100502
Revision: 100502
Author: robin
Date: 2011-10-22 17:01:04 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
(bug 31410) ArticleFeedback widget displays at top of page in cologneblue [and
nostalgia] skin
There was already an exception for the standard skin which has a similar layout
where the catlinks are at the top of the page
Modified Paths:
--------------
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js
Modified:
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
===================================================================
---
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
2011-10-22 16:47:57 UTC (rev 100501)
+++
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
2011-10-22 17:01:04 UTC (rev 100502)
@@ -327,7 +327,7 @@
// Put on bottom of article before #catlinks (if it exists)
// Except in Classic, which has #catlinks above the article but inside
content-div.
-if ( $( '#catlinks' ).length && mw.config.get( 'skin' ) != 'standard' ) {
+if ( $( '#catlinks' ).length && !mw.config.get( 'skin' ) in ['standard',
'cologneblue', 'nostalgia'] ) {
$aftDiv.insertBefore( '#catlinks' );
} else {
// CologneBlue, Nostalgia, ...
Modified:
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js
===================================================================
---
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js
2011-10-22 16:47:57 UTC (rev 100501)
+++
trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.startup.js
2011-10-22 17:01:04 UTC (rev 100502)
@@ -25,8 +25,6 @@
&& mw.util.getParamValue( 'redirect' ) != 'no'
// Not viewing the printable version
&& mw.util.getParamValue( 'printable' ) != 'yes'
- // Not using CologneBlue skin (see bug 31410)
- && mw.config.get( 'skin' ) != 'cologneblue'
) {
// Assign a tracking bucket using options from
wgArticleFeedbackTracking
mw.user.bucket(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
