Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363631 )
Change subject: Drop local 'template' icon, use 'puzzle' from upstream
......................................................................
Drop local 'template' icon, use 'puzzle' from upstream
Now that our template icon has been upstreamed thereto.
Bug: T111041
Change-Id: If101018de284dcc1be086d92427de0d88adb0e02
---
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatesUsedPage.js
M modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
D modules/ve-mw/ui/styles/images/icons/template.svg
M modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
M modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
11 files changed, 11 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/31/363631/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 5a37a5f..304947b 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -42,7 +42,7 @@
ve.ce.MWTransclusionNode.static.primaryCommandName = 'transclusion';
-ve.ce.MWTransclusionNode.static.iconWhenInvisible = 'template';
+ve.ce.MWTransclusionNode.static.iconWhenInvisible = 'puzzle';
/* Static Methods */
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
index baf712c..d93f361 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWTransclusionContextItem.js
@@ -34,7 +34,7 @@
ve.ui.MWTransclusionContextItem.static.name = 'transclusion';
-ve.ui.MWTransclusionContextItem.static.icon = 'template';
+ve.ui.MWTransclusionContextItem.static.icon = 'puzzle';
ve.ui.MWTransclusionContextItem.static.label =
OO.ui.deferMsg( 'visualeditor-dialogbutton-template-tooltip' );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index 7ac6395..bcb489b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -345,7 +345,7 @@
// Properties
this.addTemplateButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'template',
+ icon: 'puzzle',
title: ve.msg( 'visualeditor-dialog-transclusion-add-template' )
} );
this.addContentButton = new OO.ui.ButtonWidget( {
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index 6adf3ac..8e6c3c6 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -43,7 +43,7 @@
.connect( this, { click: 'onRemoveButtonClick' } );
this.infoFieldset = new OO.ui.FieldsetLayout( {
label: this.spec.getLabel(),
- icon: 'template'
+ icon: 'puzzle'
} );
this.addButton = new OO.ui.ButtonWidget( {
framed: false,
@@ -112,7 +112,7 @@
if ( this.outlineItem ) {
this.outlineItem
- .setIcon( 'template' )
+ .setIcon( 'puzzle' )
.setMovable( true )
.setRemovable( true )
.setLabel( this.spec.getLabel() );
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index a75eabd..cc833de 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -67,7 +67,7 @@
this.addTemplateFieldset = new OO.ui.FieldsetLayout( {
label: ve.msg( 'visualeditor-dialog-transclusion-placeholder' ),
- icon: 'template',
+ icon: 'puzzle',
classes: [ 've-ui-mwTransclusionDialog-addTemplateFieldset' ],
items: [ addTemplateActionFieldLayout ]
} );
@@ -93,7 +93,7 @@
if ( this.outlineItem ) {
this.outlineItem
- .setIcon( 'template' )
+ .setIcon( 'puzzle' )
.setMovable( true )
.setRemovable( true )
.setFlags( [ 'placeholder' ] )
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatesUsedPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatesUsedPage.js
index 19f2367..56bd2ce 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatesUsedPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatesUsedPage.js
@@ -22,7 +22,7 @@
// Properties
this.templatesUsedFieldset = new OO.ui.FieldsetLayout( {
label: ve.msg( 'visualeditor-templatesused-tool' ),
- icon: 'template'
+ icon: 'puzzle'
} );
if ( ve.init.target.$templatesUsed &&
ve.init.target.$templatesUsed.find( 'li' ).length ) {
@@ -56,7 +56,7 @@
if ( this.outlineItem ) {
this.outlineItem
- .setIcon( 'template' )
+ .setIcon( 'puzzle' )
.setLabel( ve.msg( 'visualeditor-templatesused-tool' )
);
}
};
diff --git a/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
b/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
index 1b1973d..08a3f64 100644
--- a/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
+++ b/modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
@@ -21,9 +21,6 @@
"parameter-set": {
"file": "../images/icons/parameter-set-ltr.svg"
},
- "template": {
- "file": "../images/icons/template.svg"
- },
"public-domain": {
"file": "../images/icons/public-domain.svg"
},
diff --git a/modules/ve-mw/ui/styles/images/icons/template.svg
b/modules/ve-mw/ui/styles/images/icons/template.svg
deleted file mode 100644
index af872de..0000000
--- a/modules/ve-mw/ui/styles/images/icons/template.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
- <g id="template">
- <path id="puzzle-piece" d="M19.46
10.417c-.351-.404-1.641-.501-1.983-.162-.769.758-1.926
1.308-1.952.162.088-2.081.818-3.743.818-3.743 0-.252-.207-.456-.463-.456 0
0-1.586-.111-3.59-.164l-1.25-.001c-.127.406.274 1.09.782 1.604.339.344.242
1.633-.162 1.984-.393.34-1.197.539-1.662.539-.445
0-1.222-.158-1.612-.479-.438-.356-.332-1.686.02-2.044.47-.476.838-1.185.721-1.606h-.483c-2.074.05-3.514.167-3.514.167-.255
0-.463.204-.463.456 0 0-.558 2.58-.558 5.348 0 2.762.558 5.331.558 5.331 0
.253.208.457.463.457 0 0 2.615.19 5.493.19 2.723 0 5.258-.19 5.258-.19.256 0
.463-.204.463-.457 0 0-.739-1.73-.824-3.869.031-1.004 1.255-.506
1.958.188.356.353 1.688.458 2.045.021.318-.392.477-1.169.477-1.614
0-.465-.199-1.269-.54-1.662z"/>
- </g>
-</svg>
diff --git a/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
b/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
index b174704..0dd4a87 100644
--- a/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
+++ b/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
@@ -27,9 +27,6 @@
"parameter-set": {
"file": "../images/icons/parameter-set-ltr.svg"
},
- "template": {
- "file": "../images/icons/template.svg"
- },
"public-domain": {
"file": "../images/icons/public-domain.svg"
},
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
index cd6a4ba..6224c41 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js
@@ -190,7 +190,7 @@
OO.inheritClass( ve.ui.MWTemplatesUsedDialogTool, ve.ui.WindowTool );
ve.ui.MWTemplatesUsedDialogTool.static.name = 'templatesUsed';
ve.ui.MWTemplatesUsedDialogTool.static.group = 'utility';
-ve.ui.MWTemplatesUsedDialogTool.static.icon = 'template';
+ve.ui.MWTemplatesUsedDialogTool.static.icon = 'puzzle';
ve.ui.MWTemplatesUsedDialogTool.static.title =
OO.ui.deferMsg( 'visualeditor-templatesused-tool' );
ve.ui.MWTemplatesUsedDialogTool.static.commandName = 'meta/templatesUsed';
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
index e8d60eb..26ea23d 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
@@ -28,7 +28,7 @@
ve.ui.MWTransclusionDialogTool.static.group = 'object';
-ve.ui.MWTransclusionDialogTool.static.icon = 'template';
+ve.ui.MWTransclusionDialogTool.static.icon = 'puzzle';
ve.ui.MWTransclusionDialogTool.static.title =
OO.ui.deferMsg( 'visualeditor-dialogbutton-template-tooltip' );
--
To view, visit https://gerrit.wikimedia.org/r/363631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If101018de284dcc1be086d92427de0d88adb0e02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
