https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109645
Revision: 109645
Author: gregchiasson
Date: 2012-01-20 21:01:52 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
AFT5 feedback page- Remove extra title line, make permalink changes as
requested, reformat timestamp, add working link to diff page, make bug fixes in
JS.
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
2012-01-20 20:54:52 UTC (rev 109644)
+++ trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php
2012-01-20 21:01:52 UTC (rev 109645)
@@ -128,7 +128,6 @@
# $out->addWikiMsg( 'articlefeedbackv5-overall-rating',
$rating );
# }
- $out->addWikiMsg( 'articlefeedbackv5-special-title' );
$out->addJsConfigVars( 'afPageId', $pageId );
$out->addModules( 'jquery.articleFeedbackv5.special' );
@@ -160,7 +159,7 @@
$opts[ (string) $key ] = $filter;
}
- $filterSelect = new XmlSelect( false,
'articleFeedbackv5-filter' );
+ $filterSelect = new XmlSelect( false,
'articleFeedbackv5-filter-select' );
$filterSelect->addOptions( $opts );
$out->addHTML(
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-01-20 20:54:52 UTC (rev 109644)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php
2012-01-20 21:01:52 UTC (rev 109645)
@@ -145,7 +145,7 @@
$rows = $dbr->select(
array( 'aft_article_feedback', 'aft_article_answer',
'aft_article_field', 'aft_article_field_option',
- 'user'
+ 'user', 'page'
),
array( 'af_id', 'af_bucket_id', 'afi_name', 'afo_name',
'aa_response_text', 'aa_response_boolean',
@@ -154,13 +154,17 @@
'af_user_ip', 'af_hide_count', 'af_abuse_count',
'af_helpful_count', 'af_unhelpful_count',
'af_delete_count',
'(SELECT COUNT(*) FROM revision WHERE rev_id >
af_revision_id AND rev_page = '.( integer ) $pageId.') AS age',
- 'CONVERT(af_helpful_count, SIGNED) -
CONVERT(af_unhelpful_count, SIGNED) AS net_helpfulness'
+ 'CONVERT(af_helpful_count, SIGNED) -
CONVERT(af_unhelpful_count, SIGNED) AS net_helpfulness',
+ 'page_latest', 'af_revision_id'
),
array( 'af_id' => $ids ),
__METHOD__,
array( 'ORDER BY' => $order ),
array(
- 'user' => array(
+ 'page' => array(
+ 'JOIN', 'page_id = af_page_id'
+ ),
+ 'user' => array(
'LEFT JOIN', 'user_id = af_user_id'
),
'aft_article_field' => array(
@@ -243,6 +247,7 @@
}
protected function renderFeedback( $record ) {
+ global $wgArticlePath;
switch( $record[0]->af_bucket_id ) {
case 1: $content .= $this->renderBucket1( $record );
break;
case 2: $content .= $this->renderBucket2( $record );
break;
@@ -268,19 +273,37 @@
$details = Html::openElement( 'div', array(
'class' => 'articleFeedbackv5-comment-details'
) )
- . Html::element( 'div', array(
+ . Html::openElement( 'div', array(
'class' => 'articleFeedbackv5-comment-details-date'
- ), date( 'r', $record[0]->af_created ) )
- . Html::openElement( 'div', array(
- 'class' => 'articleFeedbackv5-comment-details-permalink'
- ) )
+ ) )
.Html::element( 'a', array(
'href' => "#id=$id"
- ), wfMessage( 'articlefeedbackv5-comment-link' ) )
+ ), date( 'M j, Y H:i', strtotime($record[0]->af_created) ) )
. Html::closeElement( 'div' )
- . Html::element( 'div', array(
+# Remove for now, pending feedback.
+# . Html::openElement( 'div', array(
+# 'class' => 'articleFeedbackv5-comment-details-permalink'
+# ) )
+# .Html::element( 'a', array(
+# 'href' => "#id=$id"
+# ), wfMessage( 'articlefeedbackv5-comment-link' ) )
+# . Html::closeElement( 'div' )
+
+ . Html::openElement( 'div', array(
'class' => 'articleFeedbackv5-comment-details-updates'
- ), wfMessage( 'articlefeedbackv5-updates-since',
$record[0]->age ) )
+ ) )
+ . Linker::link(
+ Title::newFromText( 'Greg' ),
+ wfMessage( 'articlefeedbackv5-updates-since',
$record[0]->age ),
+ array(),
+ array(
+ 'action' => 'historysubmit',
+ 'diff' => $record[0]->page_latest,
+ 'oldid' => $record[0]->af_revision_id
+ )
+ )
+# ), wfMessage( 'articlefeedbackv5-updates-since',
$record[0]->age ) )
+ . Html::closeElement( 'div' )
. Html::closeElement( 'div' );
;
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-01-20 20:54:52 UTC (rev 109644)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-01-20 21:01:52 UTC (rev 109645)
@@ -79,7 +79,7 @@
* Binds events for each of the controls
*/
$.articleFeedbackv5special.setBinds = function() {
- $( '#articleFeedbackv5-filter' ).bind( 'change', function( e ) {
+ $( '#articleFeedbackv5-filter-select' ).bind( 'change',
function( e ) {
$.articleFeedbackv5special.filter = $(this).val();
$.articleFeedbackv5special.continue = null;
$.articleFeedbackv5special.loadFeedback( true );
@@ -93,15 +93,15 @@
$.articleFeedbackv5special.sortDirection = 'desc';
$.articleFeedbackv5special.sort = id;
$.articleFeedbackv5special.continue = null;
- $.articleFeedbackv5special.loadFeedback( true );
// unless we're flipping the direction on the current
sort.
-console.log('id is ' + id + ', old id is ' + oldId);
if( id == oldId
&& $.articleFeedbackv5special.sortDirection == 'desc')
{
$.articleFeedbackv5special.sortDirection =
'asc';
}
- // draw arrow
+
+ $.articleFeedbackv5special.loadFeedback( true );
+ // draw arrow and load feedback posts
$.articleFeedbackv5special.drawSortArrow();
return false;
@@ -125,10 +125,13 @@
} );
$( '.articleFeedbackv5-helpful-link' ).live( 'click', function(
e ) {
$.articleFeedbackv5special.flagFeedback(
$.articleFeedbackv5special.stripID( this, 'articleFeedbackv5-helpful-link-' ),
'helpful' );
+ $(this).addClass('active');
+
return false;
} );
$( '.articleFeedbackv5-unhelpful-link' ).live( 'click',
function( e ) {
$.articleFeedbackv5special.flagFeedback(
$.articleFeedbackv5special.stripID( this, 'articleFeedbackv5-unhelpful-link-'
), 'unhelpful' );
+ $(this).addClass('active');
return false;
} );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
