website: update external links to www.proxmox.com

[pve-manager.git] / www / manager6 / Utils.js

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 7bf3955a19dc66b1442a0225991b5561e0ddc5b2..5839280fab0261c3b9016646b28c4b98e7abdbd6 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -34,7 +34,7 @@ Ext.define('PVE.Utils', {
     },
 
     noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit '
-      +'<a target="_blank" href="https://www.proxmox.com/products/proxmox-ve/subscription-service-plans">'
+      +'<a target="_blank" href="https://www.proxmox.com/en/proxmox-virtual-environment/pricing">'
       +'www.proxmox.com</a> to get a list of available options.',
 
     kvm_ostypes: {
@@ -1280,6 +1280,21 @@ Ext.define('PVE.Utils', {
        return Ext.htmlEncode(first + " " + last);
     },
 
+    // expecting the following format:
+    // [v2:10.10.10.1:6802/2008,v1:10.10.10.1:6803/2008]
+    render_ceph_osd_addr: function(value) {
+       value = value.trim();
+       if (value.startsWith('[') && value.endsWith(']')) {
+           value = value.slice(1, -1); // remove []
+       }
+       value = value.replaceAll(',', '\n'); // split IPs in lines
+       let retVal = '';
+       for (const i of value.matchAll(/^(v[0-9]):(.*):([0-9]*)\/([0-9]*)$/gm)) {
+           retVal += `${i[1]}: ${i[2]}:${i[3]}<br>`;
+       }
+       return retVal.length < 1 ? value : retVal;
+    },
+
     windowHostname: function() {
        return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match,
             function(m, addr, offset, original) { return addr; });
@@ -1685,6 +1700,9 @@ Ext.define('PVE.Utils', {
                    });
                    win.getViewModel().set('isInstalled', isInstalled);
                    container.add(win);
+                   win.on('close', () => {
+                       container.el.unmask();
+                   });
                    win.show();
                    callback(win);
                }
@@ -1704,7 +1722,7 @@ Ext.define('PVE.Utils', {
            rstore,
            /not (installed|initialized)/i,
            (_, error) => {
-               nodename = nodename || 'localhost';
+               nodename = nodename || Proxmox.NodeName;
                let maskTarget = maskOwnerCt ? view.ownerCt : view;
                rstore.stopUpdate();
                PVE.Utils.showCephInstallOrMask(maskTarget, error.statusText, nodename, win => {