Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68091
Change subject: Improve langlinks styling in meta dialog
......................................................................
Improve langlinks styling in meta dialog
Change-Id: I88d6d374d34dc08ecf46053cfc639c03ec23f8bf
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve/ui/styles/ve.ui.Dialog.css
4 files changed, 52 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/91/68091/1
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index ad779f5..41d5f04 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -84,7 +84,7 @@
'visualeditor-inspector-remove-tooltip' => 'Remove',
'visualeditor-dialog-meta-categories-section' => 'Categories',
'visualeditor-dialog-meta-categories-data-label' => 'Categories',
- 'visualeditor-dialog-meta-categories-settings-label' => 'Category
settings',
+ 'visualeditor-dialog-meta-categories-options' => 'Options',
'visualeditor-dialog-meta-categories-input-placeholder' => 'Add a
category',
'visualeditor-dialog-meta-categories-input-newcategorylabel' => 'New
category',
'visualeditor-dialog-meta-categories-input-movecategorylabel' => 'Move
this category here',
diff --git a/VisualEditor.php b/VisualEditor.php
index 7b78884..58262ba 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -529,7 +529,7 @@
'visualeditor-dialog-meta-title',
'visualeditor-dialog-meta-categories-section',
'visualeditor-dialog-meta-categories-data-label',
- 'visualeditor-dialog-meta-categories-settings-label',
+ 'visualeditor-dialog-meta-categories-options',
'visualeditor-dialog-meta-categories-input-placeholder',
'visualeditor-dialog-meta-categories-input-newcategorylabel',
'visualeditor-dialog-meta-categories-input-movecategorylabel',
diff --git a/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
b/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
index 3a16e9f..ffeeb43 100644
--- a/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -58,10 +58,14 @@
// Properties
this.categoriesFieldset = new ve.ui.FieldsetLayout( {
- '$$': this.frame.$$, 'label': ve.msg(
'visualeditor-dialog-meta-categories-data-label' ), 'icon': 'tag'
+ '$$': this.frame.$$,
+ 'label': ve.msg(
'visualeditor-dialog-meta-categories-data-label' ),
+ 'icon': 'tag'
} );
- this.categorySettingsFieldset = new ve.ui.FieldsetLayout( {
- '$$': this.frame.$$, 'label': ve.msg(
'visualeditor-dialog-meta-categories-settings-label' ), 'icon': 'settings'
+ this.categoryOptionsFieldset = new ve.ui.FieldsetLayout( {
+ '$$': this.frame.$$,
+ 'label': ve.msg( 'visualeditor-dialog-meta-categories-options'
),
+ 'icon': 'settings'
} );
this.categoryWidget = new ve.ui.MWCategoryWidget( {
'$$': this.frame.$$, '$overlay': this.$overlay
@@ -75,7 +79,9 @@
'label': ve.msg(
'visualeditor-dialog-meta-categories-defaultsort-label' )
} );
this.languagesFieldset = new ve.ui.FieldsetLayout( {
- '$$': this.frame.$$, 'label': ve.msg(
'visualeditor-dialog-meta-languages-label' ), 'icon': 'language'
+ '$$': this.frame.$$,
+ 'label': ve.msg( 'visualeditor-dialog-meta-languages-label' ),
+ 'icon': 'language'
} );
// Events
@@ -97,25 +103,33 @@
'icon': 'language'
} );
- this.pages.categories.$.append( this.categoriesFieldset.$,
this.categorySettingsFieldset.$ );
+ this.pages.categories.$.append( this.categoriesFieldset.$,
this.categoryOptionsFieldset.$ );
this.categoriesFieldset.$.append( this.categoryWidget.$ );
- this.categorySettingsFieldset.$.append( this.defaultSortLabel.$,
this.defaultSortInput.$ );
+ this.categoryOptionsFieldset.$.append( this.defaultSortLabel.$,
this.defaultSortInput.$ );
this.pages.languages.$.append( this.languagesFieldset.$ );
- this.languagesFieldset.$
- .append( this.frame.$$( '<span>' ).text( ve.msg(
'visualeditor-dialog-meta-languages-readonlynote' ) ) );
+ this.languagesFieldset.$.append(
+ this.frame.$$( '<span>' )
+ .text( ve.msg(
'visualeditor-dialog-meta-languages-readonlynote' ) )
+ );
languagePromise = this.getAllLanguageItems();
languagePromise.done( ve.bind( function ( languages ) {
var i, $languagesTable = this.frame.$$( '<table>' ),
languageslength = languages.length;
$languagesTable
- .addClass( 've-ui-dialog-meta-languages-table' )
+ .addClass( 've-ui-mwMetaDialog-languages-table' )
.append( this.frame.$$( '<tr>' )
- .append( this.frame.$$( '<th>' ).append(
ve.msg( 'visualeditor-dialog-meta-languages-code-label' ) ) )
- .append( this.frame.$$( '<th>' ).append(
ve.msg( 'visualeditor-dialog-meta-languages-link-label' ) ) )
- );
+ .append(
+ this.frame.$$( '<th>' )
+ .append( ve.msg(
'visualeditor-dialog-meta-languages-code-label' ) )
+ )
+ .append(
+ this.frame.$$( '<th>' )
+ .append( ve.msg(
'visualeditor-dialog-meta-languages-link-label' ) )
+ )
+ );
for ( i = 0; i < languageslength; i++ ) {
$languagesTable
diff --git a/modules/ve/ui/styles/ve.ui.Dialog.css
b/modules/ve/ui/styles/ve.ui.Dialog.css
index 244b8ae..66f4a48 100644
--- a/modules/ve/ui/styles/ve.ui.Dialog.css
+++ b/modules/ve/ui/styles/ve.ui.Dialog.css
@@ -165,25 +165,40 @@
height: 10em;
}
-.ve-ui-dialog-meta-languages-table {
- margin: 2em 0 0 3em;
- border: 1px solid silver;
+.ve-ui-mwTemplateDialog-addParameterFieldset .ve-ui-widget {
+ display: inline-block;
+ margin-right: 0.5em;
+}
+
+/* ve.ui.MWMetaDialog */
+
+.ve-ui-mwMetaDialog-languages-table {
+ margin: 2em 0 0 0;
+ padding: 0;
+ width: 100%;
+ border: none;
border-collapse: collapse;
}
-.ve-ui-dialog-meta-languages-table th {
- background: #E8E8E8;
+.ve-ui-mwMetaDialog-languages-table th {
+ border-bottom: solid 1px #ddd;
+ text-align: left;
}
-.ve-ui-dialog-meta-languages-table th, td {
- padding: 0.5em 1em;
+.ve-ui-mwMetaDialog-languages-table th, td {
+ padding: 0.75em 1em;
+ border-bottom: solid 1px white;
}
-.ve-ui-dialog-meta-languages-table tr:nth-child(odd) td {
+.ve-ui-mwMetaDialog-languages-table tr td:first-child {
+ width: 30%;
+}
+
+.ve-ui-mwMetaDialog-languages-table tr:nth-child(odd) td {
background: #F0F0F0;
}
-.ve-ui-dialog-meta-languages-table tr:nth-child(even) td {
+.ve-ui-mwMetaDialog-languages-table tr:nth-child(even) td {
background: #F8F8F8;
}
--
To view, visit https://gerrit.wikimedia.org/r/68091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88d6d374d34dc08ecf46053cfc639c03ec23f8bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
