https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113159
Revision: 113159
Author: emsmith
Date: 2012-03-06 17:37:22 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
bug 34090 - follow up to rr111472 part 4 and follow up to r111596 (same issue
mentioned in both places)
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-06 17:36:53 UTC (rev 113158)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-06 17:37:22 UTC (rev 113159)
@@ -360,6 +360,8 @@
'articlefeedbackv5-activity-unoversight' => 'removed oversight on this
post on',
'articlefeedbackv5-activity-count' => '$1 actions on this post',
'articlefeedbackv5-activity-more' => 'Show more Activity',
+ 'articlefeedbackv5-activity-item-comment' => '$1 $2 $3 : $4',
+ 'articlefeedbackv5-activity-item' => '$1 $2 $3',
/* EmailCapture */
'articlefeedbackv5-emailcapture-response-body' => 'Hello!
@@ -659,6 +661,8 @@
'articlefeedbackv5-activity-unoversight' => 'Un-oversight display
template',
'articlefeedbackv5-activity-count' => 'Template for activity items
count',
'articlefeedbackv5-activity-more' => 'Text for the [Show more] button',
+ 'articlefeedbackv5-activity-item-comment' => 'Text for the activity
panel - user name link, activity action, date and comment',
+ 'articlefeedbackv5-activity-item' => 'Text for the activity panel -
user name link, activity action, date',
'articlefeedbackv5-emailcapture-response-body' => 'Body of an e-mail
sent to a user wishing to participate in [[mw:Extension:ArticleFeedback|article
feedback]] (see the extension documentation).
* <code>$1</code> – URL of the confirmation link
* <code>$2</code> – URL to type in the confirmation code manually.
Modified: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-06 17:36:53 UTC (rev 113158)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5Utils.php
2012-03-06 17:37:22 UTC (rev 113159)
@@ -237,7 +237,7 @@
// Make sure our notes are not too long - we won't error, just
hard substr it
global $wgArticleFeedbackv5MaxActivityNoteLength, $wgLang;
- $notes = $wgLang->truncate( $note,
$wgArticleFeedbackv5MaxActivityNoteLength );
+ $notes = $wgLang->truncate( $notes,
$wgArticleFeedbackv5MaxActivityNoteLength );
// if this is an automatic action, we create our special
extension doer and send
if ($auto) {
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-06 17:36:53 UTC (rev 113158)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiFlagFeedbackArticleFeedbackv5.php
2012-03-06 17:37:22 UTC (rev 113159)
@@ -380,8 +380,7 @@
// handle implicit hide/show logging
if ( isset( $implicit_hide )) {
- $activity = 'hidden';
- ApiArticleFeedbackv5Utils::logActivity(
$activity , $pageId, $feedbackId, '', true);
+ ApiArticleFeedbackv5Utils::logActivity(
'hidden' , $pageId, $feedbackId, '', true);
}
// Update helpful/unhelpful display count after
submission.
Modified:
trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-03-06 17:36:53 UTC (rev 113158)
+++ trunk/extensions/ArticleFeedbackv5/api/ApiViewActivityArticleFeedbackv5.php
2012-03-06 17:37:22 UTC (rev 113159)
@@ -145,20 +145,36 @@
'class' => 'articleFeedbackv5-activity-item'
) );
- // $user $did_something_on $date
- $html .= $this->getUserLink($item->log_user,
$item->log_user_text)
- . Html::element( 'span', array(
+ // so because concatenation is evil, I have to figure
out which format to use
+ // either the $user $did_something_on $date
+ // or the $user $did_something_on $date : $comment
+ // because the colon hanging around would look utterly
stupid
+
+ if ($item->log_comment == '') {
+ $html .= wfMessage(
'articlefeedbackv5-activity-item' )
+ ->rawParams(
+
$this->getUserLink($item->log_user, $item->log_user_text),
+ Html::element( 'span', array(
+ 'class' =>
'articleFeedbackv5-activity-item-action'
+ ),
+ wfMessage(
'articlefeedbackv5-activity-' . $item->log_action,
+
array())->text()),
+ $wgLang->timeanddate(
$item->log_timestamp ))
+ ->text();
+ } else {
+ $html .= wfMessage(
'articlefeedbackv5-activity-item-comment' )
+ ->rawParams(
+
$this->getUserLink($item->log_user, $item->log_user_text),
+ Html::element( 'span', array(
'class' =>
'articleFeedbackv5-activity-item-action'
- ),
- wfMessage(
'articlefeedbackv5-activity-' . $item->log_action,
- array())->text() )
- . $wgLang->timeanddate( $item->log_timestamp );
-
- // optional: <div
class="articleFeedbackv5-activity-notes">$notes</div>
- if (!empty($item->log_comment)) {
- $html .= Html::element( 'span',
+ ),
+ wfMessage(
'articlefeedbackv5-activity-' . $item->log_action,
+
array())->text()),
+ $wgLang->timeanddate(
$item->log_timestamp ),
+ Html::element( 'span',
array('class' =>
'articlefeedbackv5-activity-notes'),
- ': ' .
$item->log_comment);
+ $item->log_comment))
+ ->text();
}
// </div> for class="articleFeedbackv5-activity-item"
Modified:
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
===================================================================
---
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-06 17:36:53 UTC (rev 113158)
+++
trunk/extensions/ArticleFeedbackv5/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2012-03-06 17:37:22 UTC (rev 113159)
@@ -665,7 +665,7 @@
$( '#articlefeedbackv5-activity-log' )
.find(
'.articleFeedbackv5-activity-more' ).replaceWith(
data['articlefeedbackv5-view-activity'].activity );
}
- if(
data['query-continue']['articlefeedbackv5-view-activity'] ) {
+ if( data['query-continue'] &&
data['query-continue']['articlefeedbackv5-view-activity'] ) {
$( '#articlefeedbackv5-activity-log'
).find( '.articleFeedbackv5-activity-more' )
.attr( 'rel',
data['query-continue']['articlefeedbackv5-view-activity'].aacontinue )
.click( function( e ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
