From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Wed, 21 Oct 2015 10:25:52 +0000 (+0200)
Subject: mw.ForeignStructuredUpload: Rearrange messages to always display license name
X-Git-Tag: 1.31.0-rc.0~9313^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=f0bfcb9ae66f4548376247581ef96ad3e3935590;p=lhc%2Fweb%2Fwiklou.git

mw.ForeignStructuredUpload: Rearrange messages to always display license name

See the task for screenshots.

Bug: T116046
Change-Id: I3dc021713c460e4cd639b7d85545ad4b5afe514b
---

diff --git a/resources/Resources.php b/resources/Resources.php
index fee1e7c412..73487222d9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1238,6 +1238,7 @@ return array(
 	),
 	'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 0000000000..4143520801
--- /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 5a7e62eaa3..4ea5a56b26 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 ] } );