jenkins-bot has submitted this change and it was merged.
Change subject: mw.ForeignStructuredUpload: Rearrange messages to always
display license name
......................................................................
mw.ForeignStructuredUpload: Rearrange messages to always display license name
See the task for screenshots.
Bug: T116046
Change-Id: I3dc021713c460e4cd639b7d85545ad4b5afe514b
---
M resources/Resources.php
A resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.css
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
3 files changed, 16 insertions(+), 8 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index fee1e7c..7348722 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1238,6 +1238,7 @@
),
'mediawiki.ForeignStructuredUpload.BookletLayout' => array(
'scripts' =>
'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js',
+ 'styles' =>
'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.css',
'dependencies' => array(
'mediawiki.ForeignStructuredUpload',
'mediawiki.Upload.BookletLayout',
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.css
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.css
new file mode 100644
index 0000000..4143520
--- /dev/null
+++
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.css
@@ -0,0 +1,5 @@
+.mw-foreignStructuredUpload-bookletLayout-license {
+ font-size: 90%;
+ line-height: 1.4em;
+ color: #555;
+}
diff --git
a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 5a7e62e..4ea5a56 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -78,7 +78,8 @@
notOwnWorkLocal = mw.message(
'foreign-structured-upload-form-label-not-own-work-local-default' );
}
- $ownWorkMessage = $( '<p>' ).html( ownWorkMessage.parse() );
+ $ownWorkMessage = $( '<p>' ).html( ownWorkMessage.parse() )
+ .addClass(
'mw-foreignStructuredUpload-bookletLayout-license' );
$notOwnWorkMessage = $( '<div>' ).append(
$( '<p>' ).html( notOwnWorkMessage.parse() ),
$( '<p>' ).html( notOwnWorkLocal.parse() )
@@ -90,11 +91,7 @@
label: $notOwnWorkMessage
} );
this.ownWorkCheckbox = new OO.ui.CheckboxInputWidget().on(
'change', function ( on ) {
- if ( on ) {
- layout.messageLabel.setLabel( $ownWorkMessage );
- } else {
- layout.messageLabel.setLabel(
$notOwnWorkMessage );
- }
+ layout.messageLabel.toggle( !on );
} );
fieldset = new OO.ui.FieldsetLayout();
@@ -105,9 +102,14 @@
} ),
new OO.ui.FieldLayout( this.ownWorkCheckbox, {
align: 'inline',
- label: mw.msg(
'foreign-structured-upload-form-label-own-work' )
+ label: $( '<div>' ).append(
+ $( '<p>' ).text( mw.msg(
'foreign-structured-upload-form-label-own-work' ) ),
+ $ownWorkMessage
+ )
} ),
- this.messageLabel
+ new OO.ui.FieldLayout( this.messageLabel, {
+ align: 'top'
+ } )
] );
this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] }
);
--
To view, visit https://gerrit.wikimedia.org/r/247804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dc021713c460e4cd639b7d85545ad4b5afe514b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Edokter <er...@darcoury.nl>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
