From dcf408fc8e7816715a0a203b1c4ed1f873579750 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Thu, 16 Aug 2018 22:51:18 +0200
Subject: [PATCH] mw.ForeignStructuredUpload: Use 'helpInline' instead of
 custom styles

Before: https://phabricator.wikimedia.org/F25025765
After: https://phabricator.wikimedia.org/F25025764

Change-Id: I423c786e30570b8febc888b61450e8fce9185ba6
---
 resources/Resources.php                       |  1 -
 .../BookletLayout.js                          | 18 ++++++++----------
 .../BookletLayout.less                        | 19 -------------------
 3 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less

diff --git a/resources/Resources.php b/resources/Resources.php
index 710d54a32c..3cc5f4aee2 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1299,7 +1299,6 @@ return [
 	],
 	'mediawiki.ForeignStructuredUpload.BookletLayout' => [
 		'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js',
-		'styles' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less',
 		'dependencies' => [
 			'mediawiki.ForeignStructuredUpload',
 			'mediawiki.Upload.BookletLayout',
diff --git a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
index d38adcd6cc..ae1b590a0d 100644
--- a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
+++ b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js
@@ -148,8 +148,7 @@
 
 		// These elements are filled with text in #initialize
 		// TODO Refactor this to be in one place
-		this.$ownWorkMessage = $( '<p>' )
-			.addClass( 'mw-foreignStructuredUpload-bookletLayout-license' );
+		this.$ownWorkMessage = $( '<p>' );
 		this.$notOwnWorkMessage = $( '<p>' );
 		this.$notOwnWorkLocal = $( '<p>' );
 
@@ -173,10 +172,9 @@
 			} ),
 			new OO.ui.FieldLayout( this.ownWorkCheckbox, {
 				align: 'inline',
-				label: $( '<div>' ).append(
-					$( '<p>' ).text( mw.msg( 'upload-form-label-own-work' ) ),
-					this.$ownWorkMessage
-				)
+				label: mw.msg( 'upload-form-label-own-work' ),
+				help: this.$ownWorkMessage,
+				helpInline: true
 			} ),
 			new OO.ui.FieldLayout( this.messageLabel, {
 				align: 'top'
@@ -254,14 +252,14 @@
 		this.filenameField = new OO.ui.FieldLayout( this.filenameWidget, {
 			label: mw.msg( 'upload-form-label-infoform-name' ),
 			align: 'top',
-			classes: [ 'mw-foreignStructuredUploa-bookletLayout-small-notice' ],
-			notices: [ mw.msg( 'upload-form-label-infoform-name-tooltip' ) ]
+			help: mw.msg( 'upload-form-label-infoform-name-tooltip' ),
+			helpInline: true
 		} );
 		this.descriptionField = new OO.ui.FieldLayout( this.descriptionWidget, {
 			label: mw.msg( 'upload-form-label-infoform-description' ),
 			align: 'top',
-			classes: [ 'mw-foreignStructuredUploa-bookletLayout-small-notice' ],
-			notices: [ mw.msg( 'upload-form-label-infoform-description-tooltip' ) ]
+			help: mw.msg( 'upload-form-label-infoform-description-tooltip' ),
+			helpInline: true
 		} );
 		this.categoriesField = new OO.ui.FieldLayout( this.categoriesWidget, {
 			label: mw.msg( 'upload-form-label-infoform-categories' ),
diff --git a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less b/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less
deleted file mode 100644
index 24ca434c06..0000000000
--- a/resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less
+++ /dev/null
@@ -1,19 +0,0 @@
-.mw-foreignStructuredUpload-bookletLayout-license {
-	font-size: 90%;
-	line-height: 1.4em;
-	color: #54595d;
-}
-
-.mw-foreignStructuredUploa-bookletLayout-small-notice {
-	.oo-ui-fieldLayout-messages-notice {
-		.oo-ui-iconWidget {
-			display: none;
-		}
-
-		.oo-ui-labelWidget {
-			line-height: 1.2em;
-			font-size: 0.9em;
-			color: #54595d;
-		}
-	}
-}
-- 
2.20.1