Matthias Mullie has submitted this change and it was merged.
Change subject: (bug 44154) Blank feedback is confusing
......................................................................
(bug 44154) Blank feedback is confusing
* Display message when no comment was submitted
* Use "more"-link to toggle to full text
Change-Id: I8219d942a79fbb54082a06a488fd384fd6cadde5
---
M ArticleFeedbackv5.i18n.php
M ArticleFeedbackv5.render.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
4 files changed, 29 insertions(+), 11 deletions(-)
Approvals:
Matthias Mullie: Verified; Looks good to me, approved
diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index 0c5bbcf..1699871 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -277,7 +277,7 @@
'articlefeedbackv5watchlist' => 'Article feedback - My watched pages',
'articlefeedbackv5-desc' => 'Article feedback',
'articlefeedbackv5-comment-more' => 'More',
- 'articlefeedbackv5-comment-less' => 'Less',
+ 'articlefeedbackv5-comment-empty' => 'No text was entered',
'articlefeedbackv5-header-message' => 'Please promote good feedback and
help improve this page. $1',
'articlefeedbackv5-header-message-link-text' => 'Learn more',
'articlefeedbackv5-beta-label' => 'BETA',
@@ -1119,9 +1119,9 @@
Please visit http://prototype.wikimedia.org/articleassess/Main_Page for a
prototype installation.',
'articlefeedbackv5watchlist' => '[[Special:SpecialPages]] item',
'articlefeedbackv5-desc' => '{{desc|name=Article Feedback
v5|url=http://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5}}',
- 'articlefeedbackv5-comment-more' => 'Label for the button to expand the
truncated comment on feedback. Swaps to articlefeedbackv5-comment-less after
being clicked.
+ 'articlefeedbackv5-comment-more' => 'Label for the button to expand the
truncated comment on feedback.
{{Identical|More}}',
- 'articlefeedbackv5-comment-less' => 'Previous label
(articlefeedbackv5-comment-more) switches to this after being clicked. This is
the label for collapsing the expanded comments.',
+ 'articlefeedbackv5-comment-empty' => 'Text to be displayed instead of
the feedback comment in case there was no comment',
'articlefeedbackv5-header-message' => 'A message to be displayed on the
special page, encouraging users to behave well. Parameters:
* $1 is a link to read more about this.',
'articlefeedbackv5-header-message-link-text' => 'The link text to be
displayed (at $1 on articlefeedbackv5-header-message-text)',
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 3a408c5..9589e25 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -503,6 +503,8 @@
$id = $record->aft_id;
$text = $record->aft_comment;
+
+ // permalink should always display long version ;)
$short = $this->isPermalink ? $text : $wgLang->truncate( $text,
250 );
// If the short string is the same size as the original, no
truncation
@@ -532,17 +534,24 @@
);
}
+ // if no comment was entered, display message
+ if ( $text == '' ) {
+ $short = Linker::commentBlock( wfMessage(
'articlefeedbackv5-comment-empty' )->escaped() );
+ } else {
+ $short = Html::element( 'span',
+ array(
+ 'class' =>
'articleFeedbackv5-comment-short',
+ 'id' =>
"articleFeedbackv5-comment-short-$id"
+ ),
+ $short
+ );
+ }
+
return
Html::rawElement(
'blockquote',
array(),
- Html::element( 'span',
- array(
- 'class' =>
'articleFeedbackv5-comment-short',
- 'id' =>
"articleFeedbackv5-comment-short-$id"
- ),
- $short
- ) .
+ $short .
$fullLengthToggle
);
}
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
index 169cb9d..7a4dbe4 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -904,7 +904,8 @@
color: #000;
}
-.articleFeedbackv5-comment-short {
+.articleFeedbackv5-comment-short,
+.articleFeedbackv5-comment-full {
font-size: 1.2em;
line-height: 1.5em;
}
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index c412b05..1147a70 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -432,6 +432,14 @@
$( '#' + $.articleFeedbackv5special.currentPanelHostId
).tipsy( 'hide' );
$.articleFeedbackv5special.currentPanelHostId =
undefined;
} );
+
+ // bind short/long version toggle
+ $( document ).on( 'click touchstart',
'.articleFeedbackv5-comment-toggle', function( e ) {
+ e.preventDefault();
+ $( e.target ).siblings(
'.articleFeedbackv5-comment-short' ).hide();
+ $( e.target ).siblings(
'.articleFeedbackv5-comment-full' ).show();
+ $( e.target ).hide();
+ } );
};
// }}}
--
To view, visit https://gerrit.wikimedia.org/r/51660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8219d942a79fbb54082a06a488fd384fd6cadde5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
