wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 01:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Move reference tool into Cite menu, and language into styling"

Browse source
This commit is contained in:
jenkins-bot 2014-07-01 16:17:39 +00:00 committed by Gerrit Code Review
parent 3dd1a99660 f9e74d3c62
commit c1b7da7533
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/i18n/en.json
View file

@ -151,7 +151,7 @@
"visualeditor-dialog-transclusion-title": "Transclusion", "visualeditor-dialog-transclusion-title": "Transclusion",
"visualeditor-dialogbutton-media-tooltip": "Media", "visualeditor-dialogbutton-media-tooltip": "Media",
"visualeditor-dialogbutton-meta-tooltip": "Page settings", "visualeditor-dialogbutton-meta-tooltip": "Page settings",
"visualeditor-dialogbutton-reference-tooltip": "Reference", "visualeditor-dialogbutton-reference-tooltip": "Basic",
"visualeditor-dialogbutton-referencelist-tooltip": "References list", "visualeditor-dialogbutton-referencelist-tooltip": "References list",
"visualeditor-dialogbutton-template-tooltip": "Template", "visualeditor-dialogbutton-template-tooltip": "Template",
"visualeditor-dialogbutton-transclusion-tooltip": "Transclusion", "visualeditor-dialogbutton-transclusion-tooltip": "Transclusion",

11
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -194,9 +194,9 @@ ve.init.mw.Target.static.toolbarGroups = [
'icon': 'text-style', 'icon': 'text-style',
'indicator': 'down', 'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), 'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ], 'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
'promote': [ 'bold', 'italic' ], 'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ] 'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
// Link // Link
{ 'include': [ 'link' ] }, { 'include': [ 'link' ] },
@ -205,7 +205,8 @@ ve.init.mw.Target.static.toolbarGroups = [
'type': 'list', 'type': 'list',
'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ), 'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
'indicator': 'down', 'indicator': 'down',
'include': [ { 'group': 'cite' } ] 'include': [ { 'group': 'cite' }, 'reference' ],
'demote': [ 'reference' ]
}, },
// Structure // Structure
{ {
@ -220,8 +221,8 @@ ve.init.mw.Target.static.toolbarGroups = [
'label': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ), 'label': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
'indicator': 'down', 'indicator': 'down',
'include': '*', 'include': '*',
'promote': [ 'reference', 'mediaInsert' ], 'promote': [ 'mediaInsert', 'transclusion' ],
'demote': [ 'language', 'specialcharacter' ] 'demote': [ 'specialcharacter' ]
} }
]; ];

11
modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
View file

@ -59,9 +59,9 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
'icon': 'text-style', 'icon': 'text-style',
'indicator': 'down', 'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), 'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ], 'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
'promote': [ 'bold', 'italic' ], 'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ] 'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
// Link // Link
{ 'include': [ 'link' ] }, { 'include': [ 'link' ] },
@ -70,7 +70,8 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
'type': 'list', 'type': 'list',
'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ), 'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
'indicator': 'down', 'indicator': 'down',
'include': [ { 'group': 'cite' } ] 'include': [ { 'group': 'cite' }, 'reference' ],
'demote': [ 'reference' ]
}, },
// No structure // No structure
/* { /* {
@ -91,8 +92,8 @@ ve.ui.MWMediaEditDialog.static.toolbarGroups = [
'referenceList', 'referenceList',
'gallery' 'gallery'
], ],
'promote': [ 'reference', 'mediaInsert' ], 'promote': [ 'mediaInsert', 'transclusion' ],
'demote': [ 'language', 'specialcharacter' ] 'demote': [ 'specialcharacter' ]
} }
]; ];

12
modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
View file

@ -58,18 +58,18 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
'icon': 'text-style', 'icon': 'text-style',
'indicator': 'down', 'indicator': 'down',
'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ), 'title': OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
'include': [ { 'group': 'textStyle' }, 'clear' ], 'include': [ { 'group': 'textStyle' }, 'language', 'clear' ],
'promote': [ 'bold', 'italic' ], 'promote': [ 'bold', 'italic' ],
'demote': [ 'strikethrough', 'code', 'underline', 'clear' ] 'demote': [ 'strikethrough', 'code', 'underline', 'language', 'clear' ]
}, },
// Link // Link
{ 'include': [ 'link' ] }, { 'include': [ 'link' ] },
// Cite // Cite but not reference
{ {
'type': 'list', 'type': 'list',
'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ), 'label': OO.ui.deferMsg( 'visualeditor-toolbar-cite-label' ),
'indicator': 'down', 'indicator': 'down',
'include': [ { 'group': 'cite-transclusion' } ] 'include': [ { 'group': 'cite-transclusion' }/*, 'reference' ], 'demote': [ 'reference' */]
}, },
// No structure // No structure
/* { /* {
@ -91,8 +91,8 @@ ve.ui.MWReferenceDialog.static.toolbarGroups = [
'referenceList', 'referenceList',
'gallery' 'gallery'
], ],
'promote': [ 'mediaInsert' ], 'promote': [ 'mediaInsert', 'transclusion' ],
'demote': [ 'language', 'specialcharacter' ] 'demote': [ 'specialcharacter' ]
} }
]; ];