jenkins-bot has submitted this change and it was merged.

Change subject: Category popup fixes
......................................................................


Category popup fixes

Objectives:

* Make category popup show "Category" rather than missing message -
this is more similar to other popups like inspectors, which identify
what that thing is that you are working on
* Fix alignment of icon and label in category popup

Changes:

ve.ui.Widget.css
* Make popup title align properly with the remove button

ve.ui.MWCategoryPopupWidget.js
* Update message key

*.php
* Add new message

Change-Id: Ia8051125bbc9bde47ceb931e1ebf42b2955481ff
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve/ui/styles/ve.ui.Widget.css
M modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
4 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index b6e3e2f..a0c8069 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -34,6 +34,7 @@
        'visualeditor-dialog-media-insert-title' => 'Insert media',
        'visualeditor-dialog-media-title' => 'Media settings',
        'visualeditor-dialog-meta-categories-data-label' => 'Categories',
+       'visualeditor-dialog-meta-categories-category' => 'Category',
        'visualeditor-dialog-meta-categories-defaultsort-label' => 'Sort this 
page by default as',
        'visualeditor-dialog-meta-categories-input-matchingcategorieslabel' => 
'Matching categories',
        'visualeditor-dialog-meta-categories-input-movecategorylabel' => 'Move 
this category here',
@@ -182,6 +183,7 @@
        'visualeditor-dialog-media-title' => 'Title for the editing dialog to 
set how a media item is displayed on the page',
        'visualeditor-dialog-meta-categories-data-label' => 'Label for the 
categories sub-section.
 {{Identical|Category}}',
+       'visualeditor-dialog-meta-categories-category' => 'Title of popup for 
editing category options',
        'visualeditor-dialog-meta-categories-defaultsort-label' => 'Label for 
field setting the category default sort',
        'visualeditor-dialog-meta-categories-input-matchingcategorieslabel' => 
'Label for matching suggested category or categories',
        'visualeditor-dialog-meta-categories-input-movecategorylabel' => 'Label 
for moving a given category or categories to end of list',
diff --git a/VisualEditor.php b/VisualEditor.php
index 6542e0e..e772ebf 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -484,6 +484,7 @@
                        'visualeditor-dialog-media-insert-title',
                        'visualeditor-dialog-media-title',
                        'visualeditor-dialog-meta-categories-data-label',
+                       'visualeditor-dialog-meta-categories-category',
                        'visualeditor-dialog-meta-categories-defaultsort-label',
                        
'visualeditor-dialog-meta-categories-input-matchingcategorieslabel',
                        
'visualeditor-dialog-meta-categories-input-movecategorylabel',
diff --git a/modules/ve/ui/styles/ve.ui.Widget.css 
b/modules/ve/ui/styles/ve.ui.Widget.css
index 9405f06..63bf22b 100644
--- a/modules/ve/ui/styles/ve.ui.Widget.css
+++ b/modules/ve/ui/styles/ve.ui.Widget.css
@@ -511,8 +511,8 @@
 .ve-ui-mwCategoryPopupTitle {
        background-position: left center;
        background-repeat: no-repeat;
-       padding: 0.125em 0.5em 0.5em 2.25em;
-       margin: 0 0 1em 0.125em;
+       padding: 0.5em 0.5em 0.5em 2.25em;
+       margin: -0.4em 0 1em 0.125em;
 }
 
 .ve-ui-mwCategoryPopupMenu .ve-ui-removeButtonLabel:hover {
diff --git a/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js 
b/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index a62d916..1b8d238 100644
--- a/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -46,7 +46,7 @@
        this.$.addClass( 've-ui-mwCategoryPopupMenu' ).hide();
        this.$title
                .addClass( 've-ui-mwCategoryPopupTitle ve-ui-icon-tag' )
-               .text( ve.msg( 
'visualeditor-dialog-meta-categories-settings-label' ) );
+               .text( ve.msg( 'visualeditor-dialog-meta-categories-category' ) 
);
        this.$menu.append(
                this.$title,
                this.removeButton.$.addClass( 've-ui-mwCategoryRemoveButton' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8051125bbc9bde47ceb931e1ebf42b2955481ff
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to