http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73925
Revision: 73925
Author: adam
Date: 2010-09-28 20:51:11 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Removing the forced width from the ratings box. Using opacity 0 instead of
display none to retain the box's shape when ratings are hidden
Modified Paths:
--------------
trunk/extensions/ArticleAssessmentPilot/css/ArticleAssessment.css
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.js
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.min.js
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.js
Modified: trunk/extensions/ArticleAssessmentPilot/css/ArticleAssessment.css
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/css/ArticleAssessment.css
2010-09-28 19:29:15 UTC (rev 73924)
+++ trunk/extensions/ArticleAssessmentPilot/css/ArticleAssessment.css
2010-09-28 20:51:11 UTC (rev 73925)
@@ -63,9 +63,7 @@
background: #f7f7f7;
float: left;
}
-.article-assessment-wrapper #article-assessment-ratings {
- width: 320px;
-}
+
.article-assessment-wrapper #article-assessment-rate {
width: 650px;
margin-right: 10px;
@@ -180,7 +178,7 @@
display: none;
}
.article-assessment-wrapper .article-assessment-ratings-disabled
.article-assessment-rating-count {
- display: none;
+ opacity: 0;
}
.article-assessment-wrapper .article-assessment-ratings-disabled
.article-assessment-rating-field-name {
color: #9f9f9f;
Modified:
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.js
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.js
2010-09-28 19:29:15 UTC (rev 73924)
+++ trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.js
2010-09-28 20:51:11 UTC (rev 73925)
@@ -268,7 +268,8 @@
} );
},
'afterGetRatingData' : function( data ) {
- var settings = $( '#article-assessment' ).data(
'articleAssessment-context' ).settings;
+ var settings = $( '#article-assessment' ).data(
'articleAssessment-context' ).settings,
+ userHasRated = false;
// add the correct data to the markup
if ( typeof data.query != 'undefined' && typeof
data.query.articleassessment != 'undefined' &&
typeof
data.query.articleassessment[0] != 'undefined' ) {
@@ -285,13 +286,16 @@
.find(
'.article-assessment-rating-count' )
.html( label );
if( rating.userrating ) {
+ userHasRated = true;
// this user rated.
Word. Show them their ratings
var $rateControl = $(
'#' + rating.ratingdesc.replace( 'rating', 'rate' ) + ' .rating-field' );
$rateControl.stars(
'select', rating.userrating );
- // oh let's show them
the overall ratings too
-
$.ArticleAssessment.fn.showRatings();
}
}
+ // show the ratings if the user has
rated
+ if( userHasRated ) {
+
$.ArticleAssessment.fn.showRatings();
+ }
// if the rating is more than 5
revisions old, mark it as stale
if ( typeof
data.query.articleassessment[0].stale != 'undefined' ) {
// add the stale star class to
each on star
@@ -485,9 +489,10 @@
.addClass(
'article-assessment-error-msg' )
.html(
$.ArticleAssessment.fn.getMsg( 'articleassessment-error' ) )
.appendTo( $dialogDiv );
- $dialogDiv
- .dialog( 'option',
'height', $msgDiv.height() + 100 )
- .removeClass( 'loading'
);
+ $dialogDiv.removeClass(
'loading' );
+ $.ArticleAssessment.fn.withJUI(
function() {
+ $dialogDiv.dialog(
'option', 'height', $msgDiv.height() + 100 )
+ } );
}
} );
return false;
Modified:
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.min.js
===================================================================
---
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.min.js
2010-09-28 19:29:15 UTC (rev 73924)
+++
trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.combined.min.js
2010-09-28 20:51:11 UTC (rev 73925)
@@ -44,12 +44,13 @@
$structure.find('#article-assessment').data('articleAssessment-context',{'settings':settings,'config':config});$('#catlinks').before($structure);$.ArticleAssessment.fn.hideRatings();if($('#article-assessment-rate').height()>$('#article-assessment-ratings').height()){$('#article-assessment-ratings').css('minHeight',$('#article-assessment-rate').height());}else{$('#article-assessment-rate').css('minHeight',$('#article-assessment-ratings').height());}
$.ArticleAssessment.fn.getRatingData();$('.rating-field').each(function(){$(this).wrapAll('<div
class="rating-field"></div>').parent().stars({inputType:'select',callback:function(value,link){value.$stars.each(function(){$(this).removeClass('ui-stars-star-stale').removeClass('ui-stars-star-rated');$('#article-assessment
input:disabled').removeAttr('disabled');});}});});$('.field-wrapper
label[original-title]').each(function(){$(this).after($('<span
class="rating-field-hint"
/>').attr('original-title',$(this).attr('original-title')).tipsy({gravity:'se',opacity:'0.9'}));});$('#article-assessment').submit(function(){$.ArticleAssessment.fn.submitRating();return
false;});$('#article-assessment
input[type=submit]').attr('disabled','disabled');},'showRatings':function(){$('#article-assessment-ratings').removeClass('article-assessment-ratings-disabled').find('.article-assessment-show-ratings').hide().end().find('.article-assessment-hide-ratings').show();return
false;},'hideRatings':function(){$('#article-assessment-ratings').addClass('article-assessment-ratings-disabled').find('.article-assessment-hide-ratings').hide().end().find('.article-assessment-show-ratings').show();return
false;},'getRatingData':function(){var
config=$('#article-assessment').data('articleAssessment-context').config;var
requestData={'action':'query','list':'articleassessment','aapageid':config.pageID,'aauserrating':1,'format':'json'}
if(config.userID.length==32){requestData.aaanontoken=config.userID;}
-var
request=$.ajax({url:wgScriptPath+'/api.php',data:requestData,dataType:'json',success:$.ArticleAssessment.fn.afterGetRatingData,error:function(XMLHttpRequest,textStatus,errorThrown){$.ArticleAssessment.fn.flashNotice($.ArticleAssessment.fn.getMsg('articleassessment-error'),{'class':'article-assessment-error-msg'});}});},'afterGetRatingData':function(data){var
settings=$('#article-assessment').data('articleAssessment-context').settings;if(typeof
data.query!='undefined'&&typeof
data.query.articleassessment!='undefined'&&typeof
data.query.articleassessment[0]!='undefined'){for(var r in
data.query.articleassessment[0].ratings){var
rating=data.query.articleassessment[0].ratings[r],$rating=$('#'+rating.ratingdesc),count=rating.count,total=(rating.total/count).toFixed(1),label=$.ArticleAssessment.fn.getMsg('articleassessment-noratings',[total,count]);$rating.find('.article-assessment-rating-field-value').text(total).end().find('.article-assessment-rating-count').html(label);if(rating.userrating){var
$rateControl=$('#'+rating.ratingdesc.replace('rating','rate')+'
.rating-field');$rateControl.stars('select',rating.userrating);$.ArticleAssessment.fn.showRatings();}}
+var
request=$.ajax({url:wgScriptPath+'/api.php',data:requestData,dataType:'json',success:$.ArticleAssessment.fn.afterGetRatingData,error:function(XMLHttpRequest,textStatus,errorThrown){$.ArticleAssessment.fn.flashNotice($.ArticleAssessment.fn.getMsg('articleassessment-error'),{'class':'article-assessment-error-msg'});}});},'afterGetRatingData':function(data){var
settings=$('#article-assessment').data('articleAssessment-context').settings,userHasRated=false;if(typeof
data.query!='undefined'&&typeof
data.query.articleassessment!='undefined'&&typeof
data.query.articleassessment[0]!='undefined'){for(var r in
data.query.articleassessment[0].ratings){var
rating=data.query.articleassessment[0].ratings[r],$rating=$('#'+rating.ratingdesc),count=rating.count,total=(rating.total/count).toFixed(1),label=$.ArticleAssessment.fn.getMsg('articleassessment-noratings',[total,count]);$rating.find('.article-assessment-rating-field-value').text(total).end().find('.article-assessment-rating-count').html(label);if(rating.userrating){userHasRated=true;var
$rateControl=$('#'+rating.ratingdesc.replace('rating','rate')+'
.rating-field');$rateControl.stars('select',rating.userrating);}}
+if(userHasRated){$.ArticleAssessment.fn.showRatings();}
if(typeof
data.query.articleassessment[0].stale!='undefined'){$('.ui-stars-star-on').addClass('ui-stars-star-stale');var
msg=$.ArticleAssessment.fn.getMsg('articleassessment-stalemessage-norevisioncount');$.ArticleAssessment.fn.flashNotice(msg,{'class':'article-assessment-stale-msg'});}else{$('.ui-stars-star-on').addClass('ui-stars-star-rated');}}
$('.article-assessment-rating-field-value').each(function(){$(this).css({'width':120-(120*(parseFloat($(this).text())/5))+'px'})});},'submitRating':function(){var
config=$('#article-assessment').data('articleAssessment-context').config;$.ArticleAssessment.fn.flashNotice();$('.rating-field').stars('disable');$('#article-assessment
input').attr('disabled','disabled');var results={};$('.rating-field
input').each(function(){var
fieldName=$(this).attr('name').match(/\[([a-zA-Z0-9\-]*)\]/)[1];results[fieldName]=$(this).val();});var
request=$.ajax({url:wgScriptPath+'/api.php',type:'POST',data:{'action':'articleassessment','revid':config.revID,'pageid':config.pageID,'r1':results['wellsourced'],'r2':results['neutrality'],'r3':results['completeness'],'r4':results['readability'],'anontoken':config.userID,'format':'json'},dataType:'json',success:$.ArticleAssessment.fn.afterSubmitRating,error:function(XMLHttpRequest,textStatus,errorThrown){$.ArticleAssessment.fn.flashNotice($.ArticleAssessment.fn.getMsg('articleassessment-error'),{'class':'article-assessment-error-msg'});}});},'afterSubmitRating':function(data){$.ArticleAssessment.fn.getRatingData();$('.ui-stars-star-on').addClass('ui-stars-star-rated');$('.rating-field').stars('enable');$('#article-assessment
input:disabled').removeAttr('disabled');$.ArticleAssessment.fn.showRatings();$.ArticleAssessment.fn.flashNotice($.ArticleAssessment.fn.getMsg('articleassessment-thanks'),{'class':'article-assessment-success-msg'});},'flashNotice':function(text,options){if(arguments.length==0){$('#article-assessment
.article-assessment-flash').remove();}else{$('#article-assessment
.article-assessment-flash').remove();var
className=options['class'];$msg=$('<div
/>').addClass('article-assessment-flash').html(text);if(options['class']){$msg.addClass(options['class']);}
$('#article-assessment
.article-assessment-submit').append($msg);}},'showFeedback':function(){$.ArticleAssessment.fn.withJUI(function(){var
$dialogDiv=$('#article-assessment-dialog');if($dialogDiv.size()==0){$dialogDiv=$('<div
id="article-assessment-dialog" class="loading"
/>').dialog({width:600,height:400,bgiframe:true,autoOpen:true,modal:true,title:$.ArticleAssessment.fn.getMsg('articleassessment-survey-title'),close:function(){$(this).dialog('option','height',400).find('.article-assessment-success-msg,
.article-assessment-error-msg').remove().end().find('form').show();}});$dialogDiv.load(wgScript+'?title=Special:SimpleSurvey&survey=articlerating&raw=1',function(){$(this).find('form').bind('submit',$.ArticleAssessment.fn.submitFeedback);$(this).removeClass('loading');});}
$dialogDiv.dialog('open');});return false;},'submitFeedback':function(){var
$dialogDiv=$('#article-assessment-dialog');$dialogDiv.find('form').hide().end().addClass('loading');var
formData={};$dialogDiv.find('input').each(function(){var
name=$(this).attr('name');if(name!==''){if(name.substr(-2)=='[]'){var
trimmedName=name.substr(0,name.length-2);if(typeof
formData[trimmedName]=='undefined'){formData[trimmedName]=[];}
-formData[trimmedName].push($(this).val());}else{formData[name]=$(this).val();}}});formData.title='Special:SimpleSurvey';$.ajax({url:wgScript,type:'POST',data:formData,dataType:'html',success:function(data){var
success=$(data).find('.simplesurvey-success').size()>0;var $msgDiv=$('<div
/>').addClass(success?'article-assessment-success-msg':'article-assessment-error-msg').html($.ArticleAssessment.fn.getMsg(success?'articleassessment-survey-thanks':'articleassessment-error')).appendTo($dialogDiv);$dialogDiv.removeClass('loading');$.ArticleAssessment.fn.withJUI(function(){$dialogDiv.dialog('option','height',$msgDiv.height()+100)});if(success){$('#article-assessment
.article-assessment-rate-feedback').hide();$.cookie('mwArticleAssessmentHideFeedback',true,{'expires':30,'path':'/'});}},error:function(XMLHttpRequest,textStatus,errorThrown){var
$msgDiv=$('<div
/>').addClass('article-assessment-error-msg').html($.ArticleAssessment.fn.getMsg('articleassessment-error')).appendTo($dialogDiv);$dialogDiv.dialog('option','height',$msgDiv.height()+100).removeClass('loading');}});return
false;},'addMessages':function(messages){for(var key in
messages){$.ArticleAssessment.messages[key]=messages[key];}},'getMsg':function(key,args){if(!(key
in $.ArticleAssessment.messages)){return'['+key+']';}
+formData[trimmedName].push($(this).val());}else{formData[name]=$(this).val();}}});formData.title='Special:SimpleSurvey';$.ajax({url:wgScript,type:'POST',data:formData,dataType:'html',success:function(data){var
success=$(data).find('.simplesurvey-success').size()>0;var $msgDiv=$('<div
/>').addClass(success?'article-assessment-success-msg':'article-assessment-error-msg').html($.ArticleAssessment.fn.getMsg(success?'articleassessment-survey-thanks':'articleassessment-error')).appendTo($dialogDiv);$dialogDiv.removeClass('loading');$.ArticleAssessment.fn.withJUI(function(){$dialogDiv.dialog('option','height',$msgDiv.height()+100)});if(success){$('#article-assessment
.article-assessment-rate-feedback').hide();$.cookie('mwArticleAssessmentHideFeedback',true,{'expires':30,'path':'/'});}},error:function(XMLHttpRequest,textStatus,errorThrown){var
$msgDiv=$('<div
/>').addClass('article-assessment-error-msg').html($.ArticleAssessment.fn.getMsg('articleassessment-error')).appendTo($dialogDiv);$dialogDiv.removeClass('loading');$.ArticleAssessment.fn.withJUI(function(){$dialogDiv.dialog('option','height',$msgDiv.height()+100)});}});return
false;},'addMessages':function(messages){for(var key in
messages){$.ArticleAssessment.messages[key]=messages[key];}},'getMsg':function(key,args){if(!(key
in $.ArticleAssessment.messages)){return'['+key+']';}
var msg=$.ArticleAssessment.messages[key];if(typeof args=='object'||typeof
args=='array'){for(var i=0;i<args.length;i++){msg=msg.replace(new
RegExp('\\$'+(parseInt(i)+1),'g'),args[i]);}}else if(typeof
args=='string'||typeof args=='number'){msg=msg.replace(/\$1/g,args);}
return msg;},'withJUI':function(callback){if(typeof
$.ui=='undefined'){$.getScript(wgArticleAssessmentJUIPath,callback);}else{callback();}}}};$(document).ready(function(){$.ArticleAssessment.fn.init();});})(jQuery);jQuery.cookie=function(name,value,options){if(typeof
value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}
var expires='';if(options.expires&&(typeof
options.expires=='number'||options.expires.toUTCString)){var date;if(typeof
options.expires=='number'){date=new
Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}
Modified: trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.js
===================================================================
--- trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.js
2010-09-28 19:29:15 UTC (rev 73924)
+++ trunk/extensions/ArticleAssessmentPilot/js/ArticleAssessment.js
2010-09-28 20:51:11 UTC (rev 73925)
@@ -268,7 +268,8 @@
} );
},
'afterGetRatingData' : function( data ) {
- var settings = $( '#article-assessment' ).data(
'articleAssessment-context' ).settings;
+ var settings = $( '#article-assessment' ).data(
'articleAssessment-context' ).settings,
+ userHasRated = false;
// add the correct data to the markup
if ( typeof data.query != 'undefined' && typeof
data.query.articleassessment != 'undefined' &&
typeof
data.query.articleassessment[0] != 'undefined' ) {
@@ -285,13 +286,16 @@
.find(
'.article-assessment-rating-count' )
.html( label );
if( rating.userrating ) {
+ userHasRated = true;
// this user rated.
Word. Show them their ratings
var $rateControl = $(
'#' + rating.ratingdesc.replace( 'rating', 'rate' ) + ' .rating-field' );
$rateControl.stars(
'select', rating.userrating );
- // oh let's show them
the overall ratings too
-
$.ArticleAssessment.fn.showRatings();
}
}
+ // show the ratings if the user has
rated
+ if( userHasRated ) {
+
$.ArticleAssessment.fn.showRatings();
+ }
// if the rating is more than 5
revisions old, mark it as stale
if ( typeof
data.query.articleassessment[0].stale != 'undefined' ) {
// add the stale star class to
each on star
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
