From 58eb590510bba9e7bceabb616f67f3d7d67bbc4b Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 12 Jan 2012 09:15:34 +0100 Subject: [PATCH] use standard titles for create/edit dialogs That way we can reduce the number of gettext() messages. --- www/manager/Utils.js | 12 ++++++++ www/manager/dc/ACLView.js | 7 +++-- www/manager/dc/AuthEdit.js | 7 +---- www/manager/dc/Backup.js | 3 +- www/manager/dc/GroupEdit.js | 4 +-- www/manager/dc/HAConfig.js | 6 ++-- www/manager/dc/Summary.js | 2 +- www/manager/dc/UserEdit.js | 48 ++++++++++-------------------- www/manager/dc/UserView.js | 18 +++++------ www/manager/form/GroupSelector.js | 3 +- www/manager/openvz/CreateWizard.js | 2 +- www/manager/qemu/Config.js | 2 +- www/manager/qemu/CreateWizard.js | 2 +- www/manager/storage/DirEdit.js | 13 ++++---- www/manager/storage/IScsiEdit.js | 13 ++++---- www/manager/storage/LVMEdit.js | 13 ++++---- www/manager/storage/NFSEdit.js | 13 ++++---- www/manager/tree/ResourceTree.js | 4 +-- www/manager/window/Edit.js | 15 ++++++++-- www/manager/window/Wizard.js | 11 ++++--- 20 files changed, 94 insertions(+), 104 deletions(-) diff --git a/www/manager/Utils.js b/www/manager/Utils.js index 8262fd02..98e0b466 100644 --- a/www/manager/Utils.js +++ b/www/manager/Utils.js @@ -709,6 +709,18 @@ Ext.define('PVE.Utils', { statics: { return PVE.Utils.format_task_description(type, id); }, + dialog_title: function(subject, create, isAdd) { + if (create) { + if (isAdd) { + return gettext('Add') + ': ' + subject; + } else { + return gettext('Create') + ': ' + subject; + } + } else { + return gettext('Edit') + ': ' + subject; + } + }, + openConoleWindow: function(vmtype, vmid, nodename, vmname) { var url = Ext.urlEncode({ console: vmtype, // kvm, openvz or shell diff --git a/www/manager/dc/ACLView.js b/www/manager/dc/ACLView.js index 53799fc4..7b1a787e 100644 --- a/www/manager/dc/ACLView.js +++ b/www/manager/dc/ACLView.js @@ -18,14 +18,14 @@ Ext.define('PVE.dc.ACLAdd', { ]; if (me.aclType === 'group') { - me.title = gettext('Add') + ': ' + gettext("Group Permission"); + me.subject = gettext("Group Permission"); items.push({ xtype: 'pveGroupSelector', name: 'groups', fieldLabel: gettext('Group') }); } else if (me.aclType === 'user') { - me.title = gettext('Add') + ': ' + gettext("User Permission"); + me.subject = gettext("User Permission"); items.push({ xtype: 'pveUserSelector', name: 'users', @@ -55,9 +55,10 @@ Ext.define('PVE.dc.ACLAdd', { items: items }); - Ext.applyIf(me, { + Ext.apply(me, { url: '/access/acl', method: 'PUT', + isAdd: true, items: [ ipanel ] }); diff --git a/www/manager/dc/AuthEdit.js b/www/manager/dc/AuthEdit.js index 31d63701..454c182c 100644 --- a/www/manager/dc/AuthEdit.js +++ b/www/manager/dc/AuthEdit.js @@ -108,13 +108,8 @@ Ext.define('PVE.dc.AuthEdit', { } }); - if (me.create) { - me.title = gettext('Create realm'); - } else { - me.title = Ext.String.format(gettext('Edit realm {0}'), "'" + me.realm + "'"); - } - Ext.applyIf(me, { + subject: gettext('Realm'), url: url, method: method, items: [ ipanel ] diff --git a/www/manager/dc/Backup.js b/www/manager/dc/Backup.js index 88ae8403..2345ba01 100644 --- a/www/manager/dc/Backup.js +++ b/www/manager/dc/Backup.js @@ -270,8 +270,7 @@ Ext.define('PVE.dc.BackupEdit', { }; Ext.applyIf(me, { - title: me.create ? gettext("Create Backup Job") : - gettext("Edit Backup Job"), + subject: gettext("Backup Job"), url: url, method: method, items: [ ipanel, vmgrid ] diff --git a/www/manager/dc/GroupEdit.js b/www/manager/dc/GroupEdit.js index 8ee76cc6..08baf1b1 100644 --- a/www/manager/dc/GroupEdit.js +++ b/www/manager/dc/GroupEdit.js @@ -19,8 +19,7 @@ Ext.define('PVE.dc.GroupEdit', { } Ext.applyIf(me, { - title: me.create ? gettext('Create Group') : - Ext.String.format(gettext('Edit Group {0}'), "'" + me.groupid + "'"), + subject: gettext('Group'), url: url, method: method, items: [ @@ -48,4 +47,3 @@ Ext.define('PVE.dc.GroupEdit', { } } }); - diff --git a/www/manager/dc/HAConfig.js b/www/manager/dc/HAConfig.js index 9192bf3e..dfc3c454 100644 --- a/www/manager/dc/HAConfig.js +++ b/www/manager/dc/HAConfig.js @@ -121,10 +121,10 @@ Ext.define('PVE.dc.HAConfig', { var me = this; me.commitBtn = new PVE.button.Button({ - text: gettext('Commit'), + text: gettext('Activate'), disabled: true, confirmMsg: function () { - return gettext('Are you sure you want to commit your changes'); + return gettext('Are you sure you want to activate your changes'); }, handler: function(btn, event) { PVE.Utils.API2Request({ @@ -145,7 +145,7 @@ Ext.define('PVE.dc.HAConfig', { text: gettext('Revert changes'), disabled: true, confirmMsg: function () { - return gettext('Are you sure you want to revert (undo) your changes'); + return gettext('Are you sure you want to revert your changes'); }, handler: function(btn, event) { PVE.Utils.API2Request({ diff --git a/www/manager/dc/Summary.js b/www/manager/dc/Summary.js index 7c9eec9a..64773250 100644 --- a/www/manager/dc/Summary.js +++ b/www/manager/dc/Summary.js @@ -150,7 +150,7 @@ Ext.define('PVE.dc.HAServiceView', { dataIndex: 'owner' }, { - header: gettext('State'), + header: gettext('Status'), width: 80, sortable: true, dataIndex: 'state_str' diff --git a/www/manager/dc/UserEdit.js b/www/manager/dc/UserEdit.js index 3a807ce2..e9d25712 100644 --- a/www/manager/dc/UserEdit.js +++ b/www/manager/dc/UserEdit.js @@ -23,47 +23,29 @@ Ext.define('PVE.dc.UserEdit', { { xtype: me.create ? 'textfield' : 'displayfield', name: 'userid', - fieldLabel: 'Userid', + fieldLabel: gettext('User name'), value: me.userid, allowBlank: false, submitValue: me.create ? true : false }, - new Ext.form.field.ComboBox({ - fieldLabel: 'Group', + { + xtype: 'pveGroupSelector', name: 'groups', multiSelect: true, - hiddenName: 'groupid', - store: new Ext.data.Store({ - autoLoad: true, - model: 'pve-groups', - proxy: { - type: 'pve', - url: "/api2/json/access/groups" - }, - sorters: { - property: 'groupid', - order: 'DESC' - } - }), - valueField: 'groupid', - displayField: 'groupid', - typeAhead: true, - queryMode: 'local', - triggerAction: 'all', - emptyText: 'No Groups Selected', - selectOnFocus: true - }), + allowBlank: true, + fieldLabel: gettext('Group') + }, { xtype: 'datefield', name: 'expire', emptyText: 'never', format: 'Y-m-d', submitFormat: 'U', - fieldLabel: 'Expiration' + fieldLabel: gettext('Expire') }, { xtype: 'pvecheckbox', - fieldLabel: 'Enable', + fieldLabel: gettext('Enabled'), name: 'enable', uncheckedValue: 0, defaultValue: 1 @@ -74,23 +56,23 @@ Ext.define('PVE.dc.UserEdit', { { xtype: 'textfield', name: 'firstname', - fieldLabel: 'First Name' + fieldLabel: gettext('First Name') }, { xtype: 'textfield', name: 'lastname', - fieldLabel: 'Last Name' + fieldLabel: gettext('Last Name') }, { xtype: 'textfield', name: 'email', - fieldLabel: 'Email', + fieldLabel: 'E-Mail', vtype: 'email' }, { xtype: 'textfield', name: 'comment', - fieldLabel: 'Comment' + fieldLabel: gettext('Comment') } ]; @@ -98,7 +80,7 @@ Ext.define('PVE.dc.UserEdit', { column1.splice(1,0,{ xtype: 'pveRealmComboBox', name: 'realm', - fieldLabel: 'Realm', + fieldLabel: gettext('Realm'), allowBlank: false, listeners: { change: function(combo, newValue){ @@ -127,8 +109,8 @@ Ext.define('PVE.dc.UserEdit', { } }); - Ext.applyIf(me, { - title: me.create ? "Create User" : "Edit User '" + me.userid + "'", + Ext.applyIf(me, { + subject: gettext('User'), url: url, method: method, items: [ ipanel ] diff --git a/www/manager/dc/UserView.js b/www/manager/dc/UserView.js index 01c43b19..006232de 100644 --- a/www/manager/dc/UserView.js +++ b/www/manager/dc/UserView.js @@ -20,7 +20,7 @@ Ext.define('PVE.dc.UserView', { }; var remove_btn = new Ext.Button({ - text: 'Delete', + text: gettext('Remove'), disabled: true, handler: function() { var msg; @@ -68,7 +68,7 @@ Ext.define('PVE.dc.UserView', { }; var edit_btn = new Ext.Button({ - text: 'Modify', + text: gettext('Edit'), disabled: true, handler: run_editor }); @@ -90,7 +90,7 @@ Ext.define('PVE.dc.UserView', { var tbar = [ { - text: 'Create', + text: gettext('Create'), handler: function() { var win = Ext.create('PVE.dc.UserEdit',{ }); @@ -134,34 +134,34 @@ Ext.define('PVE.dc.UserView', { columns: [ { - header: 'User name', + header: gettext('User name'), width: 200, sortable: true, renderer: render_username, dataIndex: 'userid' }, { - header: 'Realm', + header: gettext('Realm'), width: 100, sortable: true, renderer: render_realm, dataIndex: 'userid' }, { - header: 'Enabled', + header: gettext('Enabled'), width: 80, sortable: true, dataIndex: 'enable' }, { - header: 'Expire', + header: gettext('Expire'), width: 80, sortable: true, renderer: render_expire, dataIndex: 'expire' }, { - header: 'Name', + header: gettext('Name'), width: 150, sortable: true, renderer: render_full_name, @@ -169,7 +169,7 @@ Ext.define('PVE.dc.UserView', { }, { id: 'comment', - header: 'Comment', + header: gettext('Comment'), sortable: false, dataIndex: 'comment', flex: 1 diff --git a/www/manager/form/GroupSelector.js b/www/manager/form/GroupSelector.js index 93797838..b3d94b6c 100644 --- a/www/manager/form/GroupSelector.js +++ b/www/manager/form/GroupSelector.js @@ -2,6 +2,8 @@ Ext.define('PVE.form.GroupSelector', { extend: 'PVE.form.ComboGrid', alias: ['widget.pveGroupSelector'], + allowBlank: false, + initComponent: function() { var me = this; @@ -11,7 +13,6 @@ Ext.define('PVE.form.GroupSelector', { Ext.apply(me, { store: store, - allowBlank: false, autoSelect: false, valueField: 'groupid', displayField: 'groupid', diff --git a/www/manager/openvz/CreateWizard.js b/www/manager/openvz/CreateWizard.js index c5722f0c..38d7e8e4 100644 --- a/www/manager/openvz/CreateWizard.js +++ b/www/manager/openvz/CreateWizard.js @@ -59,7 +59,7 @@ Ext.define('PVE.openvz.CreateWizard', { }); Ext.applyIf(me, { - title: 'Create new container', + subject: gettext('OpenVZ Container'), items: [ { xtype: 'inputpanel', diff --git a/www/manager/qemu/Config.js b/www/manager/qemu/Config.js index 05851a05..2899697c 100644 --- a/www/manager/qemu/Config.js +++ b/www/manager/qemu/Config.js @@ -102,7 +102,7 @@ Ext.define('PVE.qemu.Config', { var descr = vmid + " (" + (vmname ? "'" + vmname + "' " : "'VM " + vmid + "'") + ")"; Ext.apply(me, { - title: Ext.String.format(gettext("Virtual machine {0} on node {1}"), descr, "'" + nodename + "'"), + title: Ext.String.format(gettext("Virtual Machine {0} on node {1}"), descr, "'" + nodename + "'"), hstateid: 'kvmtab', tbar: [ startBtn, shutdownBtn, stopBtn, resetBtn, removeBtn, migrateBtn, consoleBtn ], diff --git a/www/manager/qemu/CreateWizard.js b/www/manager/qemu/CreateWizard.js index 8d937ff2..b58cd7ce 100644 --- a/www/manager/qemu/CreateWizard.js +++ b/www/manager/qemu/CreateWizard.js @@ -40,7 +40,7 @@ Ext.define('PVE.qemu.CreateWizard', { }); Ext.applyIf(me, { - title: 'Create new virtual machine', + subject: gettext('Virtual Machine'), items: [ { xtype: 'inputpanel', diff --git a/www/manager/storage/DirEdit.js b/www/manager/storage/DirEdit.js index b193c68a..1eaf08a6 100644 --- a/www/manager/storage/DirEdit.js +++ b/www/manager/storage/DirEdit.js @@ -101,14 +101,11 @@ Ext.define('PVE.storage.DirEdit', { storageId: me.storageId }); - me.items = [ ipanel ]; - - if (me.create) { - me.title = gettext('Create directory storage'); - } else { - me.title = Ext.String.format(gettext('Edit directory storage {0}'), - "'" + me.storageId + "'"); - } + Ext.apply(me, { + subject: 'Directory', + isAdd: true, + items: [ ipanel ] + }); me.callParent(); diff --git a/www/manager/storage/IScsiEdit.js b/www/manager/storage/IScsiEdit.js index 00014197..b3c6026e 100644 --- a/www/manager/storage/IScsiEdit.js +++ b/www/manager/storage/IScsiEdit.js @@ -167,14 +167,11 @@ Ext.define('PVE.storage.IScsiEdit', { storageId: me.storageId }); - me.items = [ ipanel ]; - - if (me.create) { - me.title = gettext('Create iSCSI storage'); - } else { - me.title = Ext.String.format(gettext('Edit iSCSI storage {0}'), - "'" + me.storageId + "'"); - } + Ext.apply(me, { + subject: 'iSCSI target', + isAdd: true, + items: [ ipanel ] + }); me.callParent(); diff --git a/www/manager/storage/LVMEdit.js b/www/manager/storage/LVMEdit.js index 7aae749a..72d40156 100644 --- a/www/manager/storage/LVMEdit.js +++ b/www/manager/storage/LVMEdit.js @@ -227,14 +227,11 @@ Ext.define('PVE.storage.LVMEdit', { storageId: me.storageId }); - me.items = [ ipanel ]; - - if (me.create) { - me.title = gettext('Create LVM storage'); - } else { - me.title = Ext.String.format(gettext('Edit LVM storage {0}'), - "'" + me.storageId + "'"); - } + Ext.apply(me, { + subject: 'LVM group', + isAdd: true, + items: [ ipanel ] + }); me.callParent(); diff --git a/www/manager/storage/NFSEdit.js b/www/manager/storage/NFSEdit.js index 36ce3ea5..0c3a32bf 100644 --- a/www/manager/storage/NFSEdit.js +++ b/www/manager/storage/NFSEdit.js @@ -169,14 +169,11 @@ Ext.define('PVE.storage.NFSEdit', { storageId: me.storageId }); - me.items = [ ipanel ]; - - if (me.create) { - me.title = gettext('Create NFS storage'); - } else { - me.title = Ext.String.format(gettext('Edit NFS storage {0}'), - "'" + me.storageId + "'"); - } + Ext.apply(me, { + subject: 'NFS share', + isAdd: true, + items: [ ipanel ] + }); me.callParent(); diff --git a/www/manager/tree/ResourceTree.js b/www/manager/tree/ResourceTree.js index 2eacc074..7bc41e51 100644 --- a/www/manager/tree/ResourceTree.js +++ b/www/manager/tree/ResourceTree.js @@ -18,11 +18,11 @@ Ext.define('PVE.tree.ResourceTree', { }, qemu: { iconCls: 'x-tree-node-computer', - text: gettext('Virtual machines') + text: gettext('Virtual Machine') }, openvz: { iconCls: 'x-tree-node-openvz', - text: gettext('OpenVZ containers') + text: gettext('OpenVZ Container') } } }, diff --git a/www/manager/window/Edit.js b/www/manager/window/Edit.js index eb122de9..6b92a0d6 100644 --- a/www/manager/window/Edit.js +++ b/www/manager/window/Edit.js @@ -6,10 +6,17 @@ Ext.define('PVE.window.Edit', { resizable: false, - // set create to true if you want a CREAT button (instead + // use this tio atimatically generate a title like + // Create: + subject: undefined, + + // set create to true if you want a Create button (instead // OK and RESET) create: false, + // set to true if you want an Add button (instead of Create) + isAdd: false, + isValid: function() { var me = this; @@ -163,7 +170,7 @@ Ext.define('PVE.window.Edit', { var form = me.formPanel.getForm(); var submitBtn = Ext.create('Ext.Button', { - text: me.create ? gettext('Create') : gettext('OK'), + text: me.create ? (me.isAdd ? gettext('Add') : gettext('Create')) : gettext('OK'), disabled: !me.create, handler: function() { me.submit(); @@ -196,6 +203,10 @@ Ext.define('PVE.window.Edit', { var twoColumn = items[0].column1 || items[0].column2; + if (me.subject && !me.title) { + me.title = PVE.Utils.dialog_title(me.subject, me.create, me.isAdd); + } + Ext.applyIf(me, { modal: true, layout: 'auto', diff --git a/www/manager/window/Wizard.js b/www/manager/window/Wizard.js index 1b953890..a6e779fd 100644 --- a/www/manager/window/Wizard.js +++ b/www/manager/window/Wizard.js @@ -70,7 +70,7 @@ Ext.define('PVE.window.Wizard', { items: [ '->', { - text: 'Back', + text: gettext('Back'), disabled: true, itemId: 'back', minWidth: 60, @@ -90,7 +90,7 @@ Ext.define('PVE.window.Wizard', { } }, { - text: 'Next', + text: gettext('Next'), disabled: true, itemId: 'next', minWidth: 60, @@ -114,7 +114,7 @@ Ext.define('PVE.window.Wizard', { } }, { - text: 'Finish', + text: gettext('Finish'), minWidth: 60, hidden: true, itemId: 'submit', @@ -170,6 +170,10 @@ Ext.define('PVE.window.Wizard', { } }; + if (me.subject && !me.title) { + me.title = PVE.Utils.dialog_title(me.subject, true, false); + } + Ext.applyIf(me, { width: 620, height: 400, @@ -179,7 +183,6 @@ Ext.define('PVE.window.Wizard', { closable: true, resizable: false, layout: 'border', - title: 'Proxmox VE Wizard', items: [ { // disabled for now - not really needed -- 2.39.2