[MediaWiki-commits] [Gerrit] Revamp media edit dialog's position widget - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Revamp media edit dialog's position widget
..


Revamp media edit dialog's position widget

Added checkbox to set position (left/center/right) or none if unchecked.
Also handle 'default' position based on the wiki direction.

Bug: 61155
Change-Id: Iddd78c98929759a13d2dc5a774e72b59cbe28c36
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
4 files changed, 127 insertions(+), 31 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 401f43e..d14e572 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -675,11 +675,7 @@
'visualeditor-dialog-media-page-advanced',
'visualeditor-dialog-media-page-general',
'visualeditor-dialog-media-position-center',
-   'visualeditor-dialog-media-type-border',
-   'visualeditor-dialog-media-type-frame',
-   'visualeditor-dialog-media-type-frameless',
-   'visualeditor-dialog-media-type-section',
-   'visualeditor-dialog-media-type-thumb',
+   'visualeditor-dialog-media-position-checkbox',
'visualeditor-dialog-media-position-left',
'visualeditor-dialog-media-position-none',
'visualeditor-dialog-media-position-right',
@@ -687,6 +683,11 @@
'visualeditor-dialog-media-size-originalsize-error',
'visualeditor-dialog-media-size-section',
'visualeditor-dialog-media-title',
+   'visualeditor-dialog-media-type-border',
+   'visualeditor-dialog-media-type-frame',
+   'visualeditor-dialog-media-type-frameless',
+   'visualeditor-dialog-media-type-section',
+   'visualeditor-dialog-media-type-thumb',
'visualeditor-dialog-meta-advancedsettings-label',
'visualeditor-dialog-meta-advancedsettings-section',
'visualeditor-dialog-meta-categories-category',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 34e5e33..ad524f7 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -45,11 +45,7 @@
 visualeditor-dialog-media-page-advanced: Advanced settings,
 visualeditor-dialog-media-page-general: General settings,
 visualeditor-dialog-media-position-center: Center,
-visualeditor-dialog-media-type-border: Border,
-visualeditor-dialog-media-type-frame: Frame,
-visualeditor-dialog-media-type-frameless: Frameless,
-visualeditor-dialog-media-type-section: Image type,
-visualeditor-dialog-media-type-thumb: Thumbnail,
+visualeditor-dialog-media-position-checkbox: Wrap content with this 
item,
 visualeditor-dialog-media-position-left: Left,
 visualeditor-dialog-media-position-none: None,
 visualeditor-dialog-media-position-right: Right,
@@ -57,6 +53,11 @@
 visualeditor-dialog-media-size-originalsize-error: Could not retrieve 
original file size.,
 visualeditor-dialog-media-size-section: Image size,
 visualeditor-dialog-media-title: Media settings,
+visualeditor-dialog-media-type-border: Border,
+visualeditor-dialog-media-type-frame: Frame,
+visualeditor-dialog-media-type-frameless: Frameless,
+visualeditor-dialog-media-type-section: Image type,
+visualeditor-dialog-media-type-thumb: Thumbnail,
 visualeditor-dialog-meta-advancedsettings-label: Advanced settings,
 visualeditor-dialog-meta-advancedsettings-section: Advanced settings,
 visualeditor-dialog-meta-categories-category: Category,
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 5315e6c..3f3a37e 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -50,11 +50,7 @@
 visualeditor-dialog-media-page-advanced: Label for the advanced 
settings page in the media edit dialog,
 visualeditor-dialog-media-page-general: Label for the general settings 
page in the media edit dialog.\n{{Identical|General settings}},
 visualeditor-dialog-media-position-center: Label for the image position 
option for aligning to the 
center.\n{{Related|Visualeditor-dialog-media-position}}\n{{Identical|Center}},
-visualeditor-dialog-media-type-border: Label for the image type option 
for bordered image.,
-visualeditor-dialog-media-type-frame: Label for the image type option 
for framed image.,
-visualeditor-dialog-media-type-frameless: Label for the image type 
option for frameless.,
-visualeditor-dialog-media-type-section: Label for the image type 

[MediaWiki-commits] [Gerrit] Revamp media edit dialog's position widget - change (mediawiki...VisualEditor)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Revamp media edit dialog's position widget
..

Revamp media edit dialog's position widget

Added checkbox to set position (left/center/right) or none if unchecked.

Change-Id: Iddd78c98929759a13d2dc5a774e72b59cbe28c36
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
4 files changed, 46 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/41/112041/1

diff --git a/VisualEditor.php b/VisualEditor.php
index 97cc95a..eb16645 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -651,11 +651,7 @@
'visualeditor-dialog-media-page-advanced',
'visualeditor-dialog-media-page-general',
'visualeditor-dialog-media-position-center',
-   'visualeditor-dialog-media-type-border',
-   'visualeditor-dialog-media-type-frame',
-   'visualeditor-dialog-media-type-frameless',
-   'visualeditor-dialog-media-type-section',
-   'visualeditor-dialog-media-type-thumb',
+   'visualeditor-dialog-media-position-checkbox',
'visualeditor-dialog-media-position-left',
'visualeditor-dialog-media-position-none',
'visualeditor-dialog-media-position-right',
@@ -663,6 +659,11 @@
'visualeditor-dialog-media-size-originalsize-error',
'visualeditor-dialog-media-size-section',
'visualeditor-dialog-media-title',
+   'visualeditor-dialog-media-type-border',
+   'visualeditor-dialog-media-type-frame',
+   'visualeditor-dialog-media-type-frameless',
+   'visualeditor-dialog-media-type-section',
+   'visualeditor-dialog-media-type-thumb',
'visualeditor-dialog-meta-categories-category',
'visualeditor-dialog-meta-categories-data-label',
'visualeditor-dialog-meta-categories-defaultsort-label',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index be2bc7b..8bccc89 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -44,11 +44,7 @@
 visualeditor-dialog-media-page-advanced: Advanced settings,
 visualeditor-dialog-media-page-general: General settings,
 visualeditor-dialog-media-position-center: Center,
-visualeditor-dialog-media-type-border: Border,
-visualeditor-dialog-media-type-frame: Frame,
-visualeditor-dialog-media-type-frameless: Frameless,
-visualeditor-dialog-media-type-section: Image type,
-visualeditor-dialog-media-type-thumb: Thumbnail,
+visualeditor-dialog-media-position-checkbox: Use set floating 
direction,
 visualeditor-dialog-media-position-left: Left,
 visualeditor-dialog-media-position-none: None,
 visualeditor-dialog-media-position-right: Right,
@@ -56,6 +52,11 @@
 visualeditor-dialog-media-size-originalsize-error: Could not retrieve 
original file size.,
 visualeditor-dialog-media-size-section: Image size,
 visualeditor-dialog-media-title: Media settings,
+visualeditor-dialog-media-type-border: Border,
+visualeditor-dialog-media-type-frame: Frame,
+visualeditor-dialog-media-type-frameless: Frameless,
+visualeditor-dialog-media-type-section: Image type,
+visualeditor-dialog-media-type-thumb: Thumbnail,
 visualeditor-dialog-meta-categories-category: Category,
 visualeditor-dialog-meta-categories-data-label: Categories,
 visualeditor-dialog-meta-categories-defaultsort-label: Sort this page 
by default as,
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 7e2f85c..dfee329 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -49,18 +49,19 @@
 visualeditor-dialog-media-page-advanced: Label for the advanced 
settings page in the media edit dialog,
 visualeditor-dialog-media-page-general: Label for the general settings 
page in the media edit dialog.\n{{Identical|General settings}},
 visualeditor-dialog-media-position-center: Label for the image position 
option for aligning to the center.,
+visualeditor-dialog-media-position-checkbox: Label for the position 
checkbox, denoting whether to use a set float position.,
 visualeditor-dialog-media-position-left: Label for the image position 
option for aligning to the left.,
 visualeditor-dialog-media-position-none: Label for the image position 
option for no alignment.,
 visualeditor-dialog-media-position-right: Label for the image position 
option for aligning to