| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.css |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | background-image: url(images/report-hover.png); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | | -.articleFeedback-instructions, .articleFeedback-description { |
| | 168 | +.articleFeedback-explanation, .articleFeedback-description { |
| 169 | 169 | float: left; |
| 170 | 170 | font-weight: bold; |
| 171 | 171 | margin-bottom: 0.75em; |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | <div class="articleFeedback-switch articleFeedback-switch-form articleFeedback-visibleWith-report" rel="form"><html:msg key="form-switch-label" /></div>\ |
| 62 | 62 | <div class="articleFeedback-title articleFeedback-visibleWith-form"><html:msg key="form-panel-title" /></div>\ |
| 63 | 63 | <div class="articleFeedback-title articleFeedback-visibleWith-report"><html:msg key="report-panel-title" /></div>\ |
| 64 | | - <div class="articleFeedback-instructions articleFeedback-visibleWith-form"><html:msg key="form-panel-instructions" /></div>\ |
| | 64 | + <div class="articleFeedback-explanation articleFeedback-visibleWith-form"><a class="articleFeedback-explanation-link"><html:msg key="form-panel-explanation" /></a></div>\ |
| 65 | 65 | <div class="articleFeedback-description articleFeedback-visibleWith-report"><html:msg key="report-panel-description" /></div>\ |
| 66 | 66 | <div style="clear:both;"></div>\ |
| 67 | 67 | <div class="articleFeedback-ratings"></div>\ |
| — | — | @@ -499,6 +499,11 @@ |
| 500 | 500 | } |
| 501 | 501 | } ) |
| 502 | 502 | .end() |
| | 503 | + .find( '.articleFeedback-explanation-link' ) |
| | 504 | + .attr( 'href', mw.config.get( 'wgArticlePath' ).replace( |
| | 505 | + '$1', mw.msg( 'articlefeedback-form-panel-explanation-link' ) |
| | 506 | + ) ) |
| | 507 | + .end() |
| 503 | 508 | .find( '.articleFeedback-pitches' ) |
| 504 | 509 | .each( function() { |
| 505 | 510 | for ( var key in context.options.pitches ) { |
| — | — | @@ -662,7 +667,10 @@ |
| 663 | 668 | // the user has rejected this within 3 days of right now |
| 664 | 669 | var display = $.cookie( prefix( 'pitch-' + key ) ); |
| 665 | 670 | if ( display !== 'hide' && context.options.pitches[key].condition() ) { |
| 666 | | - pitches.push( key ); |
| | 671 | + var weight = 'weight' in pitches ? pitches.weight : 1; |
| | 672 | + for ( var i = 0; i < weight; i++ ) { |
| | 673 | + pitches.push( key ); |
| | 674 | + } |
| 667 | 675 | } |
| 668 | 676 | } |
| 669 | 677 | if ( pitches.length ) { |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js |
| — | — | @@ -219,6 +219,7 @@ |
| 220 | 220 | }, |
| 221 | 221 | 'pitches': { |
| 222 | 222 | 'survey': { |
| | 223 | + 'weight': 1, |
| 223 | 224 | 'condition': function() { |
| 224 | 225 | return isPitchVisible( 'survey' ); |
| 225 | 226 | }, |
| — | — | @@ -236,6 +237,7 @@ |
| 237 | 238 | 'reject': 'articlefeedback-pitch-reject' |
| 238 | 239 | }, |
| 239 | 240 | 'join': { |
| | 241 | + 'weight': 1, |
| 240 | 242 | 'condition': function() { |
| 241 | 243 | //return isPitchVisible( 'join' ) && mw.user.anonymous(); |
| 242 | 244 | // Temp hack to disable join CTAs --roan Jun 2 2011 |
| — | — | @@ -275,6 +277,7 @@ |
| 276 | 278 | } |
| 277 | 279 | }, |
| 278 | 280 | 'edit': { |
| | 281 | + 'weight': 2, |
| 279 | 282 | 'condition': function() { |
| 280 | 283 | // An empty restrictions array means anyone can edit |
| 281 | 284 | var restrictions = mw.config.get( 'wgRestrictionEdit' ); |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.i18n.php |
| — | — | @@ -30,7 +30,8 @@ |
| 31 | 31 | 'articlefeedback-error' => 'An error has occured. Please try again later.', |
| 32 | 32 | 'articlefeedback-form-switch-label' => 'Rate this page', |
| 33 | 33 | 'articlefeedback-form-panel-title' => 'Rate this page', |
| 34 | | - 'articlefeedback-form-panel-instructions' => 'Please take a moment to rate this page.', |
| | 34 | + 'articlefeedback-form-panel-explanation' => 'What\'s this?', |
| | 35 | + 'articlefeedback-form-panel-explanation-link' => 'Project:ArticleFeedback', |
| 35 | 36 | 'articlefeedback-form-panel-clear' => 'Remove this rating', |
| 36 | 37 | 'articlefeedback-form-panel-expertise' => 'I am highly knowledgeable about this topic (optional)', |
| 37 | 38 | 'articlefeedback-form-panel-expertise-studies' => 'I have a relevant college/university degree', |
| Index: branches/wmf/1.17wmf1/extensions/ArticleFeedback/ArticleFeedback.hooks.php |
| — | — | @@ -63,7 +63,8 @@ |
| 64 | 64 | 'articlefeedback-error', |
| 65 | 65 | 'articlefeedback-form-switch-label', |
| 66 | 66 | 'articlefeedback-form-panel-title', |
| 67 | | - 'articlefeedback-form-panel-instructions', |
| | 67 | + 'articlefeedback-form-panel-explanation', |
| | 68 | + 'articlefeedback-form-panel-explanation-link', |
| 68 | 69 | 'articlefeedback-form-panel-clear', |
| 69 | 70 | 'articlefeedback-form-panel-expertise', |
| 70 | 71 | 'articlefeedback-form-panel-expertise-studies', |