Revision: 46005
Author: aaron
Date: 2009-01-22 06:15:39 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Show quick vote stats table after rating with ajax
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.php
trunk/extensions/FlaggedRevs/flaggedrevs.css
trunk/extensions/FlaggedRevs/language/RatingHistory.i18n.php
trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.php 2009-01-22 05:52:37 UTC
(rev 46004)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.php 2009-01-22 06:15:39 UTC
(rev 46005)
@@ -261,7 +261,7 @@
#########
# Bump this number every time you change flaggedrevs.css/flaggedrevs.js
-$wgFlaggedRevStyleVersion = 50;
+$wgFlaggedRevStyleVersion = 51;
$wgExtensionFunctions[] = 'efLoadFlaggedRevs';
Modified: trunk/extensions/FlaggedRevs/flaggedrevs.css
===================================================================
--- trunk/extensions/FlaggedRevs/flaggedrevs.css 2009-01-22 05:52:37 UTC
(rev 46004)
+++ trunk/extensions/FlaggedRevs/flaggedrevs.css 2009-01-22 06:15:39 UTC
(rev 46005)
@@ -352,3 +352,7 @@
overflow: auto;
font-size: 90%;
}
+
+.fr_reader_feedback_stats {
+ font-size: 85%;
+}
Modified: trunk/extensions/FlaggedRevs/language/RatingHistory.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/RatingHistory.i18n.php
2009-01-22 05:52:37 UTC (rev 46004)
+++ trunk/extensions/FlaggedRevs/language/RatingHistory.i18n.php
2009-01-22 06:15:39 UTC (rev 46005)
@@ -19,7 +19,7 @@
'ratinghistory-year' => 'last year',
'ratinghistory-3years' => 'last 3 years',
'ratinghistory-chart' => 'Reader feedback rating over time',
- 'ratinghistory-table' => 'Overview of last month',
+ 'ratinghistory-table' => 'Overview of ratings last month',
'ratinghistory-users' => 'Users who gave ratings',
'ratinghistory-graph' => '$2 of "$3" ($1
{{PLURAL:$1|review|reviews}})',
'readerfeedback-svg' => 'View as SVG',
Modified: trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
2009-01-22 05:52:37 UTC (rev 46004)
+++ trunk/extensions/FlaggedRevs/specialpages/RatingHistory_body.php
2009-01-22 06:15:39 UTC (rev 46005)
@@ -70,7 +70,7 @@
protected function showTable() {
global $wgOut;
# Show latest month of results
- $html = $this->getVoteAggregates( 31 );
+ $html = self::getVoteAggregates( $this->page, 31 );
if( $html ) {
$wgOut->addHTML(
'<h2>'.wfMsgHtml('ratinghistory-table')."</h2>\n".$html );
}
@@ -619,7 +619,7 @@
return $html;
}
- public function getVoteAggregates( $period ) {
+ public static function getVoteAggregates( $page, $period ) {
// Set cutoff time for period
$dbr = wfGetDB( DB_SLAVE );
$cutoff_unixtime = time() - ($period * 24 * 3600);
@@ -628,14 +628,14 @@
// Get the first revision possibly voted on in the range
$firstRevTS = $dbr->selectField( 'revision',
'rev_timestamp',
- array( 'rev_page' => $this->page->getArticleId(),
"rev_timestamp <= $cutoff" ),
+ array( 'rev_page' => $page->getArticleId(),
"rev_timestamp <= $cutoff" ),
__METHOD__,
array( 'ORDER BY' => 'rev_timestamp DESC' )
);
// Find average, median, deviation...
$res = $dbr->select( array( 'revision', 'reader_feedback' ),
array( 'rfb_ratings' ),
- array( 'rev_page' => $this->page->getArticleId(),
+ array( 'rev_page' => $page->getArticleId(),
"rev_id = rfb_rev_id",
"rfb_timestamp >= $cutoff",
// Trigger INDEX usage
@@ -658,7 +658,7 @@
}
}
// Output multi-column list
- $html = "<table class='fr_reader_feedback_stats wikitable'
cellspacing='0'><tr>";
+ $html = "<table class='wikitable fr_reader_feedback_stats'
cellspacing='0'><tr>";
foreach( FlaggedRevs::getFeedbackTags() as $tag => $w ) {
$html .=
'<th>'.wfMsgHtml("readerfeedback-$tag").'</th>';
}
@@ -711,11 +711,10 @@
return true;
}
$dbr = wfGetDB( DB_SLAVE );
- $tagTimestamp = $dbr->selectField( 'reader_feedback_pages',
- 'rfp_touched',
+ $tagTimestamp = $dbr->selectField( 'reader_feedback_pages',
'rfp_touched',
array( 'rfp_page_id' => $this->page->getArticleId(),
'rfp_tag' => $tag ),
__METHOD__ );
- $tagTimestamp = wfTimestamp( TS_MW, $tagTimestamp );
+ $tagTimestamp = wfTimestamp( TS_UNIX, $tagTimestamp );
$file_unixtime = filemtime($path);
# Check max cache time
$cutoff_unixtime = time() - (7 * 24 * 3600);
@@ -724,8 +723,7 @@
return true;
}
# If there are new votes, graph is stale
- $fileTimestamp = wfTimestamp( TS_MW, $file_unixtime );
- return ( $fileTimestamp < $tagTimestamp);
+ return ( $file_unixtime < $tagTimestamp );
}
/**
Modified: trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
2009-01-22 05:52:37 UTC (rev 46004)
+++ trunk/extensions/FlaggedRevs/specialpages/ReaderFeedback_body.php
2009-01-22 06:15:39 UTC (rev 46005)
@@ -168,12 +168,16 @@
$dbw->begin();
$ok = ( $bot || $form->submit() ); // don't submit for mindless
drones
$dbw->commit();
+
+ wfLoadExtensionMessages( 'RatingHistory' );
if( $ok ) {
return '<suc#>'.wfMsgExt( 'readerfeedback-success',
array('parseinline'),
- $form->page->getPrefixedText(), $graphLink,
$talk->getFullUrl( 'action=edit§ion=new' ) );
+ $form->page->getPrefixedText(), $graphLink,
$talk->getFullUrl( 'action=edit§ion=new' ) ) .
+
'<h4>'.wfMsgHtml('ratinghistory-table')."</h4>\n".RatingHistory::getVoteAggregates(
$form->page, 31 );
} else {
return '<err#>'.wfMsgExt( 'readerfeedback-voted',
array('parseinline'),
- $form->page->getPrefixedText(), $graphLink,
$talk->getFullUrl( 'action=edit§ion=new' ) );
+ $form->page->getPrefixedText(), $graphLink,
$talk->getFullUrl( 'action=edit§ion=new' ) ) .
+
'<h4>'.wfMsgHtml('ratinghistory-table')."</h4>\n".RatingHistory::getVoteAggregates(
$form->page, 31 );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
