[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use OOUI buttons for discard/continue translation

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382742 )

Change subject: Use OOUI buttons for discard/continue translation
..


Use OOUI buttons for discard/continue translation

Removes the need for a trash icon copy, and removes
the non-standard orange.

Change-Id: I5ad95e2fd2c598d83596143eef2fb2bb7007e381
---
M extension.json
M modules/dashboard/ext.cx.translationlist.js
D modules/dashboard/images/trash_lightgray.png
D modules/dashboard/images/trash_lightgray.svg
D modules/dashboard/images/trash_orange.png
D modules/dashboard/images/trash_orange.svg
M modules/dashboard/styles/ext.cx.translationlist.less
7 files changed, 21 insertions(+), 44 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7027fd2..3b6a772 100644
--- a/extension.json
+++ b/extension.json
@@ -906,7 +906,9 @@
"ext.cx.widgets.overlay",
"jquery.uls.data",
"moment",
-   "oojs-ui.styles.icons-interactions"
+   "oojs-ui.styles.icons-interactions",
+   "oojs-ui.styles.icons-moderation",
+   "oojs-ui.styles.icons-editing-core"
],
"messages": [
"cx-dashboard-header",
diff --git a/modules/dashboard/ext.cx.translationlist.js 
b/modules/dashboard/ext.cx.translationlist.js
index 38fc4c3..87d10b6 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -268,8 +268,8 @@
sourceDir, targetDir, $targetTitle,
$translationLink,
$sourceLanguage, $targetLanguage, $languageContainer,
-   $actionsTrigger, $deleteTranslation, $menu, 
$menuContainer,
-   $continueTranslation,
+   $actionsTrigger, deleteTranslation, $menu, 
$menuContainer,
+   continueTranslation,
$titleLanguageBlock,
$translations = [];
 
@@ -350,20 +350,25 @@
 
$actionsTrigger = $( '' )
.addClass( 'cx-tlitem__actions__trigger 
oo-ui-iconElement-icon oo-ui-icon-ellipsis' );
+   $menu = $( '' );
 
// If the translation is draft, allow deleting it
if ( translation.status === 'draft' ) {
-   $deleteTranslation = $( '' )
-   .addClass( 'cx-discard-translation' )
-   .text( mw.msg( 'cx-discard-translation' 
) );
-   $menu = $( '' )
-   .append( $deleteTranslation );
+   deleteTranslation = new OO.ui.ButtonWidget( {
+   framed: false,
+   classes: [ 'cx-discard-translation' ],
+   label: mw.msg( 'cx-discard-translation' 
),
+   icon: 'trash'
+   } );
+   $menu.append( $( '' ).append( 
deleteTranslation.$element ) );
} else if ( translation.status === 'published' ) {
-   $continueTranslation = $( '' )
-   .addClass( 'cx-continue-translation' )
-   .text( mw.msg( 
'cx-continue-translation' ) );
-   $menu = $( '' )
-   .append( $continueTranslation );
+   continueTranslation = new OO.ui.ButtonWidget( {
+   framed: false,
+   classes: [ 'cx-continue-translation' ],
+   icon: 'edit',
+   label: mw.msg( 
'cx-continue-translation' )
+   } );
+   $menu.append( $( '' ).append( 
continueTranslation.$element ) );
}
$menuContainer = $( '' )
.addClass( 'cx-tlitem__actions' )
diff --git a/modules/dashboard/images/trash_lightgray.png 
b/modules/dashboard/images/trash_lightgray.png
deleted file mode 100644
index 8152fc9..000
--- a/modules/dashboard/images/trash_lightgray.png
+++ /dev/null
Binary files differ
diff --git a/modules/dashboard/images/trash_lightgray.svg 
b/modules/dashboard/images/trash_lightgray.svg
deleted file mode 100644
index 7eadf08..000
--- 

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use OOUI buttons for discard/continue translation

[Esanders (Code Review)]

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382742 )

Change subject: Use OOUI buttons for discard/continue translation
..

Use OOUI buttons for discard/continue translation

Removes the need for trash icon copy, and converts it
to destructive red, instead of non-standard orange.

Change-Id: I5ad95e2fd2c598d83596143eef2fb2bb7007e381
---
M extension.json
M modules/dashboard/ext.cx.translationlist.js
D modules/dashboard/images/trash_lightgray.png
D modules/dashboard/images/trash_lightgray.svg
D modules/dashboard/images/trash_orange.png
D modules/dashboard/images/trash_orange.svg
M modules/dashboard/styles/ext.cx.translationlist.less
7 files changed, 22 insertions(+), 44 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/42/382742/1

diff --git a/extension.json b/extension.json
index d26046c..4d04c6b 100644
--- a/extension.json
+++ b/extension.json
@@ -905,7 +905,9 @@
"ext.cx.util",
"ext.cx.widgets.overlay",
"jquery.uls.data",
-   "moment"
+   "moment",
+   "oojs-ui.styles.icons-moderation",
+   "oojs-ui.styles.icons-editing-core"
],
"messages": [
"cx-dashboard-header",
diff --git a/modules/dashboard/ext.cx.translationlist.js 
b/modules/dashboard/ext.cx.translationlist.js
index 9fc87be..188bb47 100644
--- a/modules/dashboard/ext.cx.translationlist.js
+++ b/modules/dashboard/ext.cx.translationlist.js
@@ -268,8 +268,8 @@
sourceDir, targetDir, $targetTitle,
$translationLink,
$sourceLanguage, $targetLanguage, $languageContainer,
-   $actionsTrigger, $deleteTranslation, $menu, 
$menuContainer,
-   $continueTranslation,
+   $actionsTrigger, deleteTranslation, $menu, 
$menuContainer,
+   continueTranslation,
$titleLanguageBlock,
$translations = [];
 
@@ -350,20 +350,26 @@
 
$actionsTrigger = $( '' )
.addClass( 'cx-tlitem__actions__trigger' );
+   $menu = $( '' );
 
// If the translation is draft, allow deleting it
if ( translation.status === 'draft' ) {
-   $deleteTranslation = $( '' )
-   .addClass( 'cx-discard-translation' )
-   .text( mw.msg( 'cx-discard-translation' 
) );
-   $menu = $( '' )
-   .append( $deleteTranslation );
+   deleteTranslation = new OO.ui.ButtonWidget( {
+   framed: false,
+   classes: [ 'cx-discard-translation' ],
+   label: mw.msg( 'cx-discard-translation' 
),
+   icon: 'trash',
+   flags: [ 'destructive' ]
+   } );
+   $menu.append( $( '' ).append( 
deleteTranslation.$element ) );
} else if ( translation.status === 'published' ) {
-   $continueTranslation = $( '' )
-   .addClass( 'cx-continue-translation' )
-   .text( mw.msg( 
'cx-continue-translation' ) );
-   $menu = $( '' )
-   .append( $continueTranslation );
+   continueTranslation = new OO.ui.ButtonWidget( {
+   framed: false,
+   classes: [ 'cx-continue-translation' ],
+   icon: 'edit',
+   label: mw.msg( 
'cx-continue-translation' )
+   } );
+   $menu.append( $( '' ).append( 
continueTranslation.$element ) );
}
$menuContainer = $( '' )
.addClass( 'cx-tlitem__actions' )
diff --git a/modules/dashboard/images/trash_lightgray.png 
b/modules/dashboard/images/trash_lightgray.png
deleted file mode 100644
index 8152fc9..000
--- a/modules/dashboard/images/trash_lightgray.png
+++ /dev/null
Binary files differ
diff --git a/modules/dashboard/images/trash_lightgray.svg 
b/modules/dashboard/images/trash_lightgray.svg
deleted file mode 100644
index 7eadf08..000
---