http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89444
Revision: 89444
Author: catrope
Date: 2011-06-03 21:09:20 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
1.17wmf1: MFT r89360, r89365, r89367
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.hooks.php
branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.i18n.php
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.hooks.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.hooks.php
2011-06-03 21:08:51 UTC (rev 89443)
+++ branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.hooks.php
2011-06-03 21:09:20 UTC (rev 89444)
@@ -63,7 +63,8 @@
'articlefeedback-error',
'articlefeedback-form-switch-label',
'articlefeedback-form-panel-title',
- 'articlefeedback-form-panel-instructions',
+ 'articlefeedback-form-panel-explanation',
+ 'articlefeedback-form-panel-explanation-link',
'articlefeedback-form-panel-clear',
'articlefeedback-form-panel-expertise',
'articlefeedback-form-panel-expertise-studies',
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.i18n.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.i18n.php
2011-06-03 21:08:51 UTC (rev 89443)
+++ branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.i18n.php
2011-06-03 21:09:20 UTC (rev 89444)
@@ -30,7 +30,8 @@
'articlefeedback-error' => 'An error has occured. Please try again
later.',
'articlefeedback-form-switch-label' => 'Rate this page',
'articlefeedback-form-panel-title' => 'Rate this page',
- 'articlefeedback-form-panel-instructions' => 'Please take a moment to
rate this page.',
+ 'articlefeedback-form-panel-explanation' => 'What\'s this?',
+ 'articlefeedback-form-panel-explanation-link' =>
'Project:ArticleFeedback',
'articlefeedback-form-panel-clear' => 'Remove this rating',
'articlefeedback-form-panel-expertise' => 'I am highly knowledgeable
about this topic (optional)',
'articlefeedback-form-panel-expertise-studies' => 'I have a relevant
college/university degree',
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
===================================================================
---
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
2011-06-03 21:08:51 UTC (rev 89443)
+++
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js
2011-06-03 21:09:20 UTC (rev 89444)
@@ -219,6 +219,7 @@
},
'pitches': {
'survey': {
+ 'weight': 1,
'condition': function() {
return isPitchVisible( 'survey' );
},
@@ -236,6 +237,7 @@
'reject': 'articlefeedback-pitch-reject'
},
'join': {
+ 'weight': 1,
'condition': function() {
//return isPitchVisible( 'join' ) &&
mw.user.anonymous();
// Temp hack to disable join CTAs --roan Jun 2
2011
@@ -275,6 +277,7 @@
}
},
'edit': {
+ 'weight': 2,
'condition': function() {
// An empty restrictions array means anyone can
edit
var restrictions = mw.config.get(
'wgRestrictionEdit' );
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
===================================================================
---
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
2011-06-03 21:08:51 UTC (rev 89443)
+++
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css
2011-06-03 21:09:20 UTC (rev 89444)
@@ -164,7 +164,7 @@
background-image: url(images/report-hover.png);
}
-.articleFeedback-instructions, .articleFeedback-description {
+.articleFeedback-explanation, .articleFeedback-description {
float: left;
font-weight: bold;
margin-bottom: 0.75em;
Modified:
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
===================================================================
---
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
2011-06-03 21:08:51 UTC (rev 89443)
+++
branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js
2011-06-03 21:09:20 UTC (rev 89444)
@@ -60,7 +60,7 @@
<div class="articleFeedback-switch articleFeedback-switch-form
articleFeedback-visibleWith-report" rel="form"><html:msg
key="form-switch-label" /></div>\
<div class="articleFeedback-title
articleFeedback-visibleWith-form"><html:msg key="form-panel-title" /></div>\
<div class="articleFeedback-title
articleFeedback-visibleWith-report"><html:msg key="report-panel-title" /></div>\
- <div class="articleFeedback-instructions
articleFeedback-visibleWith-form"><html:msg key="form-panel-instructions"
/></div>\
+ <div class="articleFeedback-explanation
articleFeedback-visibleWith-form"><a
class="articleFeedback-explanation-link"><html:msg key="form-panel-explanation"
/></a></div>\
<div class="articleFeedback-description
articleFeedback-visibleWith-report"><html:msg key="report-panel-description"
/></div>\
<div style="clear:both;"></div>\
<div class="articleFeedback-ratings"></div>\
@@ -499,6 +499,11 @@
}
} )
.end()
+ .find( '.articleFeedback-explanation-link' )
+ .attr( 'href', mw.config.get(
'wgArticlePath' ).replace(
+ '$1', mw.msg(
'articlefeedback-form-panel-explanation-link' )
+ ) )
+ .end()
.find( '.articleFeedback-pitches' )
.each( function() {
for ( var key in
context.options.pitches ) {
@@ -662,7 +667,10 @@
// the user has
rejected this within 3 days of right now
var display = $.cookie(
prefix( 'pitch-' + key ) );
if ( display !== 'hide'
&& context.options.pitches[key].condition() ) {
- pitches.push(
key );
+ var weight =
'weight' in pitches ? pitches.weight : 1;
+ for ( var i =
0; i < weight; i++ ) {
+
pitches.push( key );
+ }
}
}
if ( pitches.length ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
