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 = $( '<div>' )
.addClass( 'cx-tlitem__actions__trigger
oo-ui-iconElement-icon oo-ui-icon-ellipsis' );
+ $menu = $( '<ul>' );
// If the translation is draft, allow deleting it
if ( translation.status === 'draft' ) {
- $deleteTranslation = $( '<li>' )
- .addClass( 'cx-discard-translation' )
- .text( mw.msg( 'cx-discard-translation'
) );
- $menu = $( '<ul>' )
- .append( $deleteTranslation );
+ deleteTranslation = new OO.ui.ButtonWidget( {
+ framed: false,
+ classes: [ 'cx-discard-translation' ],
+ label: mw.msg( 'cx-discard-translation'
),
+ icon: 'trash'
+ } );
+ $menu.append( $( '<li>' ).append(
deleteTranslation.$element ) );
} else if ( translation.status === 'published' ) {
- $continueTranslation = $( '<li>' )
- .addClass( 'cx-continue-translation' )
- .text( mw.msg(
'cx-continue-translation' ) );
- $menu = $( '<ul>' )
- .append( $continueTranslation );
+ continueTranslation = new OO.ui.ButtonWidget( {
+ framed: false,
+ classes: [ 'cx-continue-translation' ],
+ icon: 'edit',
+ label: mw.msg(
'cx-continue-translation' )
+ } );
+ $menu.append( $( '<li>' ).append(
continueTranslation.$element ) );
}
$menuContainer = $( '<div>' )
.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..0000000
--- 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..0000000
--- a/modules/dashboard/images/trash_lightgray.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 96 96"
enable-background="new 0 0 96 96">
- <path d="M13.5 28.2l8.1 63c.3 2.7 2.4 4.8 5.1 4.8h42.6c2.7 0 4.8-2.1
4.8-4.5l8.1-63H13.5v-.3zM77.4 6.6C81 6.6 84 8.1 84 9.9v7.2c0 1.8-3 1.5-6.9
1.5H18.6c-3.6 0-6.6.3-6.6-1.5V9.9c0-1.8 3-3.3 6.9-3.3l13.5-1.2L37.2 0h21.3l5.1
5.7 13.8.9z" fill="#72777d"/>
-</svg>
diff --git a/modules/dashboard/images/trash_orange.png
b/modules/dashboard/images/trash_orange.png
deleted file mode 100644
index 90fc00b..0000000
--- a/modules/dashboard/images/trash_orange.png
+++ /dev/null
Binary files differ
diff --git a/modules/dashboard/images/trash_orange.svg
b/modules/dashboard/images/trash_orange.svg
deleted file mode 100644
index c1d9875..0000000
--- a/modules/dashboard/images/trash_orange.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="258 348 96 96"
enable-background="new 258 348 96 96">
- <g fill="#FF5D00">
- <path d="M271.6 376.3l8.2 63.1c0 2.5 2.1 4.6 4.8 4.6h42.8c2.6 0
4.8-2.1 4.8-4.6l8.2-63.1h-68.8zm63.7-21.6c3.8 0 6.8 1.5 6.8 3.3v7.1c0 1.8-3.1
1.4-6.8 1.4h-58.6c-3.8 0-6.8.4-6.8-1.4V358c0-1.8 3-3.3 6.8-3.3l13.5-1.2
4.9-5.5h21.2l5.1 5.6 13.9 1.1z"/>
- </g>
-</svg>
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less
b/modules/dashboard/styles/ext.cx.translationlist.less
index e01e80c..e62ae66 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -57,28 +57,8 @@
border-radius: @borderRadius;
li {
- padding: 5px 30px;
- cursor: pointer;
- background-repeat: no-repeat;
- background-position: center left;
- background-size: 30px 20px;
- }
- .cx-discard-translation {
-
.background-image-svg('../images/trash_lightgray.svg',
'../images/trash_lightgray.png');
+ padding: 0;
margin: 0;
-
- &:hover {
-
.background-image-svg('../images/trash_orange.svg',
'../images/trash_orange.png');
- background-color: darken( #fff, 5% );
- }
- }
- .cx-continue-translation {
- .background-image-svg('../images/edit.svg',
'../images/edit.png');
- margin: 0;
-
- &:hover {
- background-color: darken( #fff, 5% );
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/382742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ad95e2fd2c598d83596143eef2fb2bb7007e381
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Petar.petkovic <ppetko...@wikimedia.org>
Gerrit-Reviewer: Pginer <pgi...@wikimedia.org>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
