WMDE-leszek has submitted this change and it was merged.
Change subject: Bold tooltip labels and color-coded change size
......................................................................
Bold tooltip labels and color-coded change size
Also introduced language specific number formating. Therefore removed the
'bytes' message. Plural form will be computed in the size messages directly.
Comment label and value were split so the parsed comment can be used
plain without parsing the html again.
Bug: T137183
Change-Id: I12f30cb518e3cc5210528d5b22737dde868a0325
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.RevisionSlider.RevisionListView.js
M modules/ext.RevisionSlider.css
5 files changed, 57 insertions(+), 22 deletions(-)
Approvals:
WMDE-leszek: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 25c19c9..27c1b19 100644
--- a/extension.json
+++ b/extension.json
@@ -118,8 +118,8 @@
"modules/ext.RevisionSlider.RevisionListView.js"
],
"messages": [
- "revisionslider-revision-bytes",
- "revisionslider-label-article-size",
+ "revisionslider-label-date",
+ "revisionslider-label-page-size",
"revisionslider-label-change-size",
"revisionslider-label-edited-by",
"revisionslider-label-comment"
diff --git a/i18n/en.json b/i18n/en.json
index ed4af13..06b92f2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,11 +8,11 @@
"revisionslider-desc": "Shows a slider allowing selecting and comparing of
revisions on a diff page",
"revisionslider-beta-feature-message": "Revision Slider",
"revisionslider-beta-feature-description": "Show a revision slider when
comparing two revisions of a page.",
- "revisionslider-revision-bytes": "$1 {{PLURAL:$1|byte|bytes}}",
- "revisionslider-label-article-size": "Article size: $1",
- "revisionslider-label-change-size": "Change size: $1",
- "revisionslider-label-comment": "Comment: $1",
- "revisionslider-label-edited-by": "Edited by: $1",
+ "revisionslider-label-date": "<strong>Date:</strong> $1",
+ "revisionslider-label-page-size": "<strong>Page size:</strong> $1
{{PLURAL:$2|byte|bytes}}",
+ "revisionslider-label-change-size": "<strong>Change size:</strong> $1
{{PLURAL:$2|byte|bytes}}",
+ "revisionslider-label-comment": "Comment: ",
+ "revisionslider-label-edited-by": "<strong>Edited by:</strong> $1",
"revisionslider-loading-placeholder": "The revision slider is loading.",
"revisionslider-loading-failed": "The revision slider failed to load.",
"revisionslider-loading-out-of-range": "The revision slider failed to load
as the requested revisions are not in the top 500 versions of the page.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 56adeae..1ee1e3c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,10 +9,10 @@
"revisionslider-desc":
"{{desc|name=RevisionSlider|url=https://www.mediawiki.org/wiki/Extension:RevisionSlider}}";,
"revisionslider-beta-feature-message": "Label for the revision slider
Beta Feature.",
"revisionslider-beta-feature-description": "Description for the
revision slider Beta Feature, describing the feature that will be enabled.",
- "revisionslider-revision-bytes": "Label describing the amount of bytes
changed in this revision.\nParameters:\n* $1 - Revision size in bytes.",
- "revisionslider-label-article-size": "Label describing the size of this
revision.\nParameters:\n* $1 - Revision size.",
- "revisionslider-label-change-size": "Label describing the size of the
change compared to the revision before.\nParameters:\n* $1 - Change size.",
- "revisionslider-label-comment": "Label showing the edit summary of a
revision.\nParameters:\n* $1 - The revision's edit summary.",
+ "revisionslider-label-date": "Label describing the creation date of
this revision.\nParameters:\n* $1 - Creation date.",
+ "revisionslider-label-page-size": "Label describing the size of this
revision.\nParameters:\n* $1 - Formatted article size.\n* $2 - Article size as
raw number.",
+ "revisionslider-label-change-size": "Label describing the size of the
change compared to the revision before.\nParameters:\n* $1 - Formatted change
size colored with markup.\n* $2 - Change size as raw number.",
+ "revisionslider-label-comment": "Label showing the edit summary of a
revision.",
"revisionslider-label-edited-by": "Gender-neutral label showing this
revision's author's username.\nParameters:\n* $1 - Username.",
"revisionslider-loading-placeholder": "Message shown while the
RevisionSlider is still loading on a diff page. Once loaded the message is
removed.",
"revisionslider-loading-failed": "Message shown if the RevisionSlider
fails to initially load.",
diff --git a/modules/ext.RevisionSlider.RevisionListView.js
b/modules/ext.RevisionSlider.RevisionListView.js
index 2d7098d..81a7786 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -66,19 +66,19 @@
makeTooltip: function ( rev ) {
var $tooltip = $( '<div>' )
.append(
- $( '<p>' ).append( $( '<b>' ).text(
rev.getFormattedDate() ) ),
+ $( '<p>' ).append(
+ mw.message(
'revisionslider-label-date', rev.getFormattedDate() ).parseDom()
+ ),
rev.getUser() ?
- $( '<bdi>' ).append( $( '<p>'
).text(
- mw.msg(
'revisionslider-label-edited-by', mw.html.escape( rev.getUser() ) )
+ $( '<bdi>' ).append( $( '<p>'
).append(
+ mw.message(
'revisionslider-label-edited-by', mw.html.escape( rev.getUser() ) ).parseDom()
) )
: '',
this.makeCommentLine( rev ),
- $( '<p>' ).text(
- mw.msg(
'revisionslider-label-article-size', mw.msg( 'revisionslider-revision-bytes',
rev.getSize() ) )
+ $( '<p>' ).append(
+ mw.message(
'revisionslider-label-page-size', mw.language.convertNumber( rev.getSize() ),
rev.getSize() ).parseDom()
),
- $( '<p>' ).text(
- mw.msg(
'revisionslider-label-change-size', mw.msg( 'revisionslider-revision-bytes',
rev.getRelativeSize() ) )
- ),
+ this.makeChangeSizeLine( rev ),
rev.isMinor() ? $( '<p>' ).text(
mw.message( 'minoredit' ).text() ) : '' );
return $tooltip.html();
@@ -97,9 +97,32 @@
return $( '<bdi>' ).append(
$( '<p>' ).append(
- $( '<i>' ).html(
- mw.msg(
'revisionslider-label-comment', rev.getParsedComment() )
- ) )
+ $( '<strong>' ).text( mw.message(
'revisionslider-label-comment' ).text() ),
+ $( '<em>' ).append(
+ rev.getParsedComment()
+ )
+ )
+ );
+ },
+
+ makeChangeSizeLine: function ( rev ) {
+ var changeSizeClass = 'mw-no-change',
+ leadingSign = '',
+ $changeNumber;
+
+ if ( rev.getRelativeSize() > 0 ) {
+ changeSizeClass = 'mw-positive-change';
+ leadingSign = '+';
+ } else if ( rev.getRelativeSize() < 0 ) {
+ changeSizeClass = 'mw-negative-change';
+ }
+
+ $changeNumber = $( '<span>' )
+ .addClass( changeSizeClass )
+ .text( leadingSign + mw.language.convertNumber(
rev.getRelativeSize() ) );
+
+ return $( '<p>' ).append(
+ mw.message( 'revisionslider-label-change-size',
$changeNumber, rev.getRelativeSize() ).parseDom()
);
}
} );
diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 31a7ee8..921834e 100644
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -76,6 +76,18 @@
max-width: none;
}
+.mw-revision-tooltip .mw-positive-change {
+ color: #006400;
+}
+
+.mw-revision-tooltip .mw-negative-change {
+ color: #8b0000;
+}
+
+.mw-revision-tooltip .mw-no-change {
+ color: #aaaaaa;
+}
+
.mw-revisions {
height: 140px;
white-space: nowrap;
--
To view, visit https://gerrit.wikimedia.org/r/294477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12f30cb518e3cc5210528d5b22737dde868a0325
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.fisc...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Gabriel Birke <gabriel.bi...@wikimedia.de>
Gerrit-Reviewer: Jakob <jakob.warkot...@wikimedia.de>
Gerrit-Reviewer: Kai Nissen (WMDE) <kai.nis...@wikimedia.de>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.fisc...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
