Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67645
Change subject: ve.ui.MWTemplateDialog: Display description from template data
......................................................................
ve.ui.MWTemplateDialog: Display description from template data
There are still many blanks in the TemplateDialog and unused
fields from MWTemplateDialog.
Change-Id: Iab0ef0a2623a27a03c6c35276b4f63e51239c214
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
M modules/ve/ui/styles/ve.ui.Dialog.css
4 files changed, 29 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/45/67645/1
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 7c849ff..0fd2b39 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -30,6 +30,7 @@
'visualeditor-dialog-media-title' => 'Media settings',
'visualeditor-dialog-reference-title' => 'Reference',
'visualeditor-dialog-template-title' => 'Template',
+ 'visualeditor-dialog-template-nodescription' => 'No description
available',
'visualeditor-dialog-media-insert-title' => 'Insert media',
'visualeditor-dialog-media-insert-button' => 'Insert media',
'visualeditor-media-input-placeholder' => 'Search for media',
@@ -167,6 +168,7 @@
'visualeditor-dialog-media-title' => 'Title for the editing dialog to
set how a media item is displayed on the page',
'visualeditor-dialog-reference-title' => '{{Identical|Reference}}',
'visualeditor-dialog-template-title' => '{{Identical|Template}}',
+ 'visualeditor-dialog-template-nodescription' => 'Text displayed if
template has no description.',
'visualeditor-dialog-action-apply' => 'Label text for button to apply
changes made in dialog.
See also:
diff --git a/VisualEditor.php b/VisualEditor.php
index b809950..f500721 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -576,6 +576,7 @@
'visualeditor-dialog-reference-title',
'visualeditor-dialogbutton-reference-tooltip',
'visualeditor-dialog-template-title',
+ 'visualeditor-dialog-template-nodescription',
'visualeditor-dialogbutton-template-tooltip',
'visualeditor-dialog-meta-title',
'visualeditor-dialogbutton-meta-tooltip',
diff --git a/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
b/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
index 2fe0ad0..9603a10 100644
--- a/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -382,9 +382,10 @@
* @param {Object} template Template info
*/
ve.ui.MWTemplateDialog.prototype.addTemplatePage = function ( page, template )
{
- var fieldset,
- // FIXME centralize regex
- label = ( template.target.href && template.target.href.replace(
/^(\.\.?\/)*/, '' ) ) || template.target.wt;
+ var fieldset, $desc,
+ // FIXME: Centralize regex
+ label = ( template.target.href && template.target.href.replace(
/^(\.\.?\/)*/, '' ) ) || template.target.wt,
+ spec = template.spec;
fieldset = new ve.ui.FieldsetLayout( {
'$$': this.frame.$$,
@@ -392,8 +393,19 @@
'icon': 'template'
} );
+ $desc = $('<p>');
+ if ( spec.description && spec.description.en ) {
+ $desc
+ .text( spec.description.en );
+ } else {
+ $desc
+ .addClass( 've-ui-mwTemplateDialog-muted' )
+ .text( ve.msg(
'visualeditor-dialog-template-nodescription' ) );
+ }
+
+
this.addPage( page, { 'label': label, 'icon': 'template' } );
- this.pages[page].$.append( fieldset.$ );
+ this.pages[page].$.append( fieldset.$, $desc );
};
/**
@@ -406,6 +418,7 @@
*/
ve.ui.MWTemplateDialog.prototype.addParameterPage = function ( page, name,
value, spec ) {
var fieldset, textInput, inputLabel,
+ // FIXME: Extract lang code of content language instead
harcoding "en"
label = spec && spec.label ? spec.label.en : name,
description = spec && spec.description && spec.description.en;
@@ -432,10 +445,10 @@
fieldset.$.append( inputLabel.$ );
}
- // TODO: Use spec.required
- // TODO: Use spec.deprecation
- // TODO: Use spec.default
- // TODO: Use spec.type
+ // TODO: Use spec.param#required
+ // TODO: Use spec.param#deprecated
+ // TODO: Use spec.param#default
+ // TODO: Use spec.param#type
this.addPage( page, { 'label': label, 'icon': 'parameter', 'level': 1 }
);
this.pages[page].$.append( fieldset.$ );
diff --git a/modules/ve/ui/styles/ve.ui.Dialog.css
b/modules/ve/ui/styles/ve.ui.Dialog.css
index 244b8ae..fc4b0e1 100644
--- a/modules/ve/ui/styles/ve.ui.Dialog.css
+++ b/modules/ve/ui/styles/ve.ui.Dialog.css
@@ -165,6 +165,11 @@
height: 10em;
}
+.ve-ui-mwTemplateDialog-muted {
+ color: #777;
+ font-style: italic;
+}
+
.ve-ui-dialog-meta-languages-table {
margin: 2em 0 0 3em;
border: 1px solid silver;
--
To view, visit https://gerrit.wikimedia.org/r/67645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab0ef0a2623a27a03c6c35276b4f63e51239c214
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
