jenkins-bot has submitted this change and it was merged.

Change subject: Dialog: Use a 'done' button on edit param page instead of 'back'
......................................................................


Dialog: Use a 'done' button on edit param page instead of 'back'

'Back' suggests that changes in the form won't be saved.

Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.ui.tdDialog.js
4 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index f150e2b..0a96b6c 100644
--- a/extension.json
+++ b/extension.json
@@ -103,6 +103,7 @@
                                "templatedata-modal-button-cancel",
                                "templatedata-modal-button-changelang",
                                "templatedata-modal-button-delparam",
+                               "templatedata-modal-button-done",
                                "templatedata-modal-button-importParams",
                                "templatedata-modal-button-restoreparam",
                                "templatedata-modal-button-saveparam",
diff --git a/i18n/en.json b/i18n/en.json
index a42b2f4..0bc182a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -51,6 +51,7 @@
        "templatedata-modal-button-cancel": "Cancel",
        "templatedata-modal-button-changelang": "Change language",
        "templatedata-modal-button-delparam": "Remove parameter information",
+       "templatedata-modal-button-done": "Done",
        "templatedata-modal-button-importParams": "Import parameters",
        "templatedata-modal-button-restoreparam": "Restore parameter",
        "templatedata-modal-button-saveparam": "Save",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e64c5c0..23c6504 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -59,6 +59,7 @@
        "templatedata-modal-button-cancel": "Label of the cancel 
button.\n{{Identical|Cancel}}",
        "templatedata-modal-button-changelang": "Label for the button to change 
language in the edit dialog.\n{{Identical|Change language}}",
        "templatedata-modal-button-delparam": "Button to remove a parameter.",
+       "templatedata-modal-button-done": "Label of the done button.",
        "templatedata-modal-button-importParams": "Label of the import button",
        "templatedata-modal-button-restoreparam": "Label for the button to 
restore a previously deleted parameter in the edit dialog.",
        "templatedata-modal-button-saveparam": "Label for the button to save 
parameter details in the templatedata edit dialog.\n{{Identical|Save}}",
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 62fdacc..d751cb7 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -36,6 +36,12 @@
                modes: 'list'
        },
        {
+               action: 'done',
+               label: mw.msg( 'templatedata-modal-button-done' ),
+               flags: [ 'primary', 'progressive' ],
+               modes: 'edit'
+       },
+       {
                action: 'add',
                label: mw.msg( 'templatedata-modal-button-addparam' ),
                flags: [ 'constructive' ],
@@ -56,7 +62,7 @@
                action: 'back',
                label: mw.msg( 'templatedata-modal-button-back' ),
                flags: 'safe',
-               modes: [ 'edit', 'language', 'add' ]
+               modes: [ 'language', 'add' ]
        }
 ];
 
@@ -904,7 +910,7 @@
  * @return {OO.ui.Process} Action process
  */
 mw.TemplateData.Dialog.prototype.getActionProcess = function ( action ) {
-       if ( action === 'back' ) {
+       if ( action === 'back' || action === 'done' ) {
                return new OO.ui.Process( function () {
                        this.switchPanels( 'listParams' );
                }, this );

-- 
To view, visit https://gerrit.wikimedia.org/r/238123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to