[MediaWiki-commits] [Gerrit] LanguageInspector: Made the widget use one line for language - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232877

Change subject: LanguageInspector: Made the widget use one line for language
......................................................................

LanguageInspector: Made the widget use one line for language

Change-Id: Id417c22102a3c70fbf448e424b03072aa6d203e9
---
M demos/ve/ve.demo.init.js
M src/ui/inspectors/ve.ui.LanguageInspector.js
M src/ui/styles/widgets/ve.ui.LanguageInputWidget.css
M src/ui/widgets/ve.ui.LanguageInputWidget.js
4 files changed, 20 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/77/232877/1

diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js
index 551d25e..f69b121 100644
--- a/demos/ve/ve.demo.init.js
+++ b/demos/ve/ve.demo.init.js
@@ -61,7 +61,7 @@
                languageInput.setLangAndDir( 'qqx', currentDir );
        } );
 
-       languageInput.languageCodeField.$element.hide();
+       languageInput.languageLayout.$element.hide();
 
        languageInput.setLangAndDir( currentLang, currentDir );
        // Dir doesn't change on init but styles need to be set
diff --git a/src/ui/inspectors/ve.ui.LanguageInspector.js 
b/src/ui/inspectors/ve.ui.LanguageInspector.js
index 647e55c..2c18244 100644
--- a/src/ui/inspectors/ve.ui.LanguageInspector.js
+++ b/src/ui/inspectors/ve.ui.LanguageInspector.js
@@ -26,8 +26,6 @@
 
 ve.ui.LanguageInspector.static.name = 'language';
 
-ve.ui.LanguageInspector.static.size = 'medium';
-
 ve.ui.LanguageInspector.static.title =
        OO.ui.deferMsg( 'visualeditor-languageinspector-title' );
 
diff --git a/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css 
b/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css
index cc9ffbf..33c4032 100644
--- a/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css
+++ b/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css
@@ -5,16 +5,20 @@
  */
 
 .ve-ui-languageInputWidget-findLanguageButton .oo-ui-buttonElement-button > 
.oo-ui-labelElement-label {
-       width: 8.5em;
+       width: 9.5em;
        text-align: left;
        overflow: hidden;
        text-overflow: ellipsis;
 }
 
-.ve-ui-languageInputWidget-languageCodeTextInput {
+.ve-ui-languageInputWidget .oo-ui-fieldLayout.oo-ui-labelElement > 
.oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
        width: 7em;
+}
+
+.ve-ui-languageInputWidget-languageCodeTextInput {
+       width: 6em;
 }
 
 .ve-ui-languageInputWidget-directionSelect {
        margin-bottom: 0.5em;
-}
\ No newline at end of file
+}
diff --git a/src/ui/widgets/ve.ui.LanguageInputWidget.js 
b/src/ui/widgets/ve.ui.LanguageInputWidget.js
index e9d8c2b..ae23cfe 100644
--- a/src/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/src/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -28,9 +28,11 @@
        // Properties
        this.lang = null;
        this.dir = null;
+
        this.overlay = new ve.ui.Overlay( { classes: [ 've-ui-overlay-global' ] 
} );
        this.dialogs = config.dialogManager || new ve.ui.WindowManager( { 
factory: ve.ui.windowFactory, isolate: true } );
        this.availableLanguages = config.availableLanguages;
+
        this.findLanguageButton = new OO.ui.ButtonWidget( {
                classes: [ 've-ui-languageInputWidget-findLanguageButton' ],
                label: ve.msg( 
'visualeditor-languageinspector-widget-changelang' ),
@@ -42,14 +44,15 @@
        this.directionSelect = new OO.ui.ButtonSelectWidget( {
                classes: [ 've-ui-languageInputWidget-directionSelect' ]
        } );
-       this.findLanguageField = new OO.ui.FieldLayout( 
this.findLanguageButton, {
-               align: 'left',
-               label: ve.msg( 
'visualeditor-languageinspector-widget-label-language' )
-       } );
-       this.languageCodeField = new OO.ui.FieldLayout( 
this.languageCodeTextInput, {
-               align: 'left',
-               label: ve.msg( 
'visualeditor-languageinspector-widget-label-langcode' )
-       } );
+
+       this.languageLayout = new OO.ui.ActionFieldLayout(
+               this.languageCodeTextInput,
+               this.findLanguageButton,
+               {
+                       align: 'left',
+                       label: ve.msg( 
'visualeditor-languageinspector-widget-label-language' )
+               }
+       );
        this.directionField = new OO.ui.FieldLayout( this.directionSelect, {
                align: 'left',
                label: ve.msg( 
'visualeditor-languageinspector-widget-label-direction' )
@@ -86,8 +89,7 @@
        this.$element
                .addClass( 've-ui-languageInputWidget' )
                .append(
-                       this.findLanguageField.$element,
-                       this.languageCodeField.$element,
+                       this.languageLayout.$element,
                        this.directionField.$element
                );
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/232877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id417c22102a3c70fbf448e424b03072aa6d203e9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits