jenkins-bot has submitted this change and it was merged.
Change subject: Remove field set label on reference edit dialog
......................................................................
Remove field set label on reference edit dialog
Objective:
* Allow fieldsets to not have labels
* Remove label from reference edit dialog field set
Changes:
ve.ui.Layout.css
* Only apply negative top margin if fieldset label is being used
ve.ui.FieldsetLayout.js
* Only add label element to DOM if icon or label are used
ve.ui.MWReferenceEditDialog.js
* Remove label from reference edit dialog's first fieldset
*.php
* Remove unused message
Change-Id: I4a36e819ec6ef73aad80d3fb2f06000cb35ec109
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceEditDialog.js
M modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
M modules/ve/ui/styles/ve.ui.Layout.css
5 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index eba8886..9899d56 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -58,7 +58,6 @@
'visualeditor-dialog-meta-languages-readonlynote' => 'This is a list of
pages in other languages that are linked to this one; for now, it can only be
edited in source mode.',
'visualeditor-dialog-meta-languages-section' => 'Languages',
'visualeditor-dialog-meta-title' => 'Page settings',
- 'visualeditor-dialog-reference-content-section' => 'Reference content',
'visualeditor-dialog-reference-insert-button' => 'Insert reference',
'visualeditor-dialog-reference-insert-title' => 'Insert reference',
'visualeditor-dialog-reference-options-group-label' => 'Use this group',
@@ -296,7 +295,6 @@
{{Identical|Language}}',
'visualeditor-dialog-meta-title' => 'MetaData dialog title text.
{{Identical|Page settings}}',
- 'visualeditor-dialog-reference-content-section' => 'Label for the
reference content sub-section',
'visualeditor-dialog-reference-insert-button' => 'Used as label for the
button.
{{Identical|Insert reference}}',
'visualeditor-dialog-reference-insert-title' => 'Reference insert
dialog title text.
diff --git a/VisualEditor.php b/VisualEditor.php
index 7948c79..679f77e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -605,7 +605,6 @@
'visualeditor-dialog-meta-languages-readonlynote',
'visualeditor-dialog-meta-languages-section',
'visualeditor-dialog-meta-title',
- 'visualeditor-dialog-reference-content-section',
'visualeditor-dialog-reference-insert-button',
'visualeditor-dialog-reference-insert-title',
'visualeditor-dialog-reference-options-group-label',
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceEditDialog.js
index 81c4a1b..ec88204 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceEditDialog.js
@@ -50,9 +50,7 @@
// Properties
this.contentFieldset = new ve.ui.FieldsetLayout( {
- '$$': this.frame.$$,
- 'label': ve.msg(
'visualeditor-dialog-reference-content-section' ),
- 'icon': 'reference'
+ '$$': this.frame.$$
} );
this.optionsFieldset = new ve.ui.FieldsetLayout( {
'$$': this.frame.$$,
diff --git a/modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
b/modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
index 7a81b48..d21f35b 100644
--- a/modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
+++ b/modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
@@ -31,9 +31,12 @@
this.$.addClass( 've-ui-fieldsetLayout-decorated' );
this.$label.addClass( 've-ui-icon-' + config.icon );
}
- this.$
- .addClass( 've-ui-fieldsetLayout' )
- .append( this.$label );
+ this.$.addClass( 've-ui-fieldsetLayout' );
+ if ( config.icon || config.label ) {
+ this.$
+ .addClass( 've-ui-fieldsetLayout-labeled' )
+ .append( this.$label );
+ }
};
/* Inheritance */
diff --git a/modules/ve/ui/styles/ve.ui.Layout.css
b/modules/ve/ui/styles/ve.ui.Layout.css
index acbda91..825deea 100644
--- a/modules/ve/ui/styles/ve.ui.Layout.css
+++ b/modules/ve/ui/styles/ve.ui.Layout.css
@@ -21,10 +21,14 @@
.ve-ui-fieldsetLayout {
border: none;
- margin: -0.75em 0 1.75em 0;
+ margin: 0 0 1.75em 0;
padding: 0;
}
+.ve-ui-fieldsetLayout-labeled {
+ margin-top: -0.75em;
+}
+
.ve-ui-fieldsetLayout > legend.ve-ui-labeledElement-label {
font-size: 1.5em;
margin-bottom: 0.5em;
--
To view, visit https://gerrit.wikimedia.org/r/73890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a36e819ec6ef73aad80d3fb2f06000cb35ec109
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
