]> git.proxmox.com Git - pve-manager.git/blobdiff - www/manager6/storage/PBSEdit.js
projects / pve-manager.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ui: eslint: fix various spacing related issues
[pve-manager.git] / www / manager6 / storage / PBSEdit.js
diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js
index b8e7117386df3d7e73e9a12bf4f9325aac4f6fea..2479304a277931cc08a1731e49a1c81f7e4d125b 100644 (file)
--- a/www/manager6/storage/PBSEdit.js
+++ b/www/manager6/storage/PBSEdit.js
@@ -1,7 +1,7 @@
 /*global QRCode*/
 Ext.define('PVE.Storage.PBSKeyShow', {
     extend: 'Ext.window.Window',
-    alias: ['widget.pveKeyShow'],
+    xtype: 'pvePBSKeyShow',
     mixins: ['Proxmox.Mixin.CBind'],
 
     width: 600,
@@ -31,7 +31,7 @@ Ext.define('PVE.Storage.PBSKeyShow', {
                {
                    xtype: 'textfield',
                    fieldLabel: gettext('Key'),
-                   labelWidth: 30,
+                   labelWidth: 80,
                    inputId: 'encryption-key-value',
                    cbind: {
                        value: '{key}',
@@ -40,7 +40,7 @@ Ext.define('PVE.Storage.PBSKeyShow', {
                },
                {
                    xtype: 'component',
-                   html: gettext('Keep your master key safe, but easily accessible for disaster recovery.')
+                   html: gettext('Keep your encryption key safe, but easily accessible for disaster recovery.')
                        + '<br>' + gettext('We recommend the following safe-keeping strategy:'),
                },
                {
@@ -124,7 +124,7 @@ Ext.define('PVE.Storage.PBSKeyShow', {
            border: false,
            padding: '10 10 10 10',
            userCls: 'pmx-hint',
-           html: gettext('Please save the encryption key - loosing it will render any backup created with it unuseable'),
+           html: gettext('Please save the encryption key - losing it will render any backup created with it unusable'),
        },
     ],
     buttons: [
@@ -136,9 +136,11 @@ Ext.define('PVE.Storage.PBSKeyShow', {
            },
        },
     ],
-    paperkey: function(key) {
+    paperkey: function(keyString) {
        let me = this;
 
+       const key = JSON.parse(keyString);
+
        const qrwidth = 500;
        let qrdiv = document.createElement('div');
        let qrcode = new QRCode(qrdiv, {
@@ -146,7 +148,12 @@ Ext.define('PVE.Storage.PBSKeyShow', {
            height: qrwidth,
            correctLevel: QRCode.CorrectLevel.H,
        });
-       qrcode.makeCode(key);
+       qrcode.makeCode(keyString);
+
+       let shortKeyFP = '';
+       if (key.fingerprint) {
+           shortKeyFP = PVE.Utils.render_pbs_fingerprint(key.fingerprint);
+       }
 
        let printFrame = document.createElement("iframe");
        Object.assign(printFrame.style, {
@@ -157,15 +164,15 @@ Ext.define('PVE.Storage.PBSKeyShow', {
            height: "0",
            border: "0",
        });
-       const prettifiedKey = JSON.stringify(JSON.parse(key), null, 2);
+       const prettifiedKey = JSON.stringify(key, null, 2);
        const keyQrBase64 = qrdiv.children[0].toDataURL("image/png");
        const html = `<html><head><script>
            window.addEventListener('DOMContentLoaded', (ev) => window.print());
        </script><style>@media print and (max-height: 150mm) {
          h4, p { margin: 0; font-size: 1em; }
        }</style></head><body style="padding: 5px;">
-       <h4>Encryption Key - Storage '${me.sid}'</h4>
-<p style="font-size: 1.2em; font-family: monospace; white-space: pre-wrap;">
+       <h4>Encryption Key - Storage '${me.sid}' (${shortKeyFP})</h4>
+<p style="font-size:1.2em;font-family:monospace;white-space:pre-wrap;overflow-wrap:break-word;">
 -----BEGIN PROXMOX BACKUP KEY-----
 ${prettifiedKey}
 -----END PROXMOX BACKUP KEY-----</p>
@@ -182,6 +189,8 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', {
     xtype: 'pvePBSEncryptionKeyTab',
     mixins: ['Proxmox.Mixin.CBind'],
 
+    onlineHelp: 'storage_pbs_encryption',
+
     onGetValues: function(form) {
        let values = {};
        if (form.cryptMode === 'upload') {
@@ -202,7 +211,7 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', {
 
        let cryptKeyInfo = values['encryption-key'];
        if (cryptKeyInfo) {
-           let icon = '<span class="fa fa-lock good"></span> '
+           let icon = '<span class="fa fa-lock good"></span> ';
            if (cryptKeyInfo.match(/^[a-fA-F0-9]{2}:/)) { // new style fingerprint
                let shortKeyFP = PVE.Utils.render_pbs_fingerprint(cryptKeyInfo);
                values['crypt-key-fp'] = icon + `${gettext('Active')} - ${gettext('Fingerprint')} ${shortKeyFP}`;
@@ -424,7 +433,7 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', {
 Ext.define('PVE.storage.PBSInputPanel', {
     extend: 'PVE.panel.StorageBase',
 
-    //onlineHelp: 'storage_pbs',
+    onlineHelp: 'storage_pbs',
 
     apiCallDone: function(success, response, options) {
        let res = response.result.data;
@@ -479,13 +488,6 @@ Ext.define('PVE.storage.PBSInputPanel', {
                fieldLabel: gettext('Password'),
                allowBlank: false,
            },
-           {
-               xtype: me.isCreate ? 'textfield' : 'displayfield',
-               name: 'datastore',
-               value: '',
-               fieldLabel: 'Datastore',
-               allowBlank: false,
-           },
        ];
 
        me.column2 = [
@@ -496,6 +498,13 @@ Ext.define('PVE.storage.PBSInputPanel', {
                submitValue: true,
                fieldLabel: gettext('Content'),
            },
+           {
+               xtype: me.isCreate ? 'textfield' : 'displayfield',
+               name: 'datastore',
+               value: '',
+               fieldLabel: 'Datastore',
+               allowBlank: false,
+           },
        ];
 
        me.columnB = [
The Proxmox VE Management API and Web UI