add proxmox-widget-toolkit to pve gui

we will use components from proxmox-widget-toolkit rather than
directly from pve-manager

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index ec1eb9a55b4d0f73dd32af2ab82d1c53176b3a69..628e734ae519928c15008a8e8ec39e75b7456b4d 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -52,6 +52,7 @@ my $basedirs = {
     docs => '/usr/share/pve-docs',
     fontawesome => '/usr/share/fonts-font-awesome',
     xtermjs => '/usr/share/pve-xtermjs',
+    widgettoolkit => '/usr/share/javascript/proxmox-widget-toolkit',
 };
 
 sub init {
@@ -113,6 +114,9 @@ sub init {
            '/favicon.ico' => {
                file => "$basedirs->{manager}/images/favicon.ico",
            },
+           '/proxmoxlib.js' => {
+               file => "$basedirs->{widgettoolkit}/proxmoxlib.js",
+           },
        },
        dirs => $dirs,
     };
@@ -209,6 +213,12 @@ sub get_index {
     my $ver = PVE::pvecfg::version();
     my $release = PVE::pvecfg::release();
 
+    my $wtversionraw = PVE::Tools::file_read_firstline("$basedirs->{widgettoolkit}/proxmoxlib.js");
+    my $wtversion;
+    if ($wtversionraw =~ m|^// (.*)$|) {
+       $wtversion = $1;
+    };
+
     my $vars = {
        lang => $lang,
        langfile => $langfile,
@@ -218,6 +228,7 @@ sub get_index {
        nodename => $nodename,
        debug => $server->{debug},
        version => "$ver-$release",
+       wtversion => $wtversion,
     };
 
     # by default, load the normal index

diff --git a/debian/control b/debian/control
index c7d5a7177556b3284d020338a3e97cde2628f115..0c344cc0624a3aa7b2f7fb2bc45c9e96fb1b7d87 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,7 @@ Depends: apt-transport-https,
          novnc-pve,
          perl (>= 5.10.0-19),
          postfix | mail-transport-agent,
+         proxmox-widget-toolkit (>= 1.0-10),
          pve-cluster (>= 5.0-17),
          pve-container,
          pve-docs,

diff --git a/www/index.html.tpl b/www/index.html.tpl
index 6bbdea18536ff92afe8cefceb831977159e23fce..147d349217b41eb2e268db9d57b9b7587d405c14 100644 (file)
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -23,6 +23,14 @@
     <script type="text/javascript" src="/pve2/ext6/ext-all.js"></script>
     <script type="text/javascript" src="/pve2/ext6/charts.js"></script>
     [% END %]
+    <script type="text/javascript">
+    Proxmox = {
+       Setup: { auth_cookie_name: 'PVEAuthCookie' },
+       UserName: '[% username %]',
+       CSRFPreventionToken: '[% token %]'
+    };
+    </script>
+    <script type="text/javascript" src="/proxmoxlib.js?ver=[% wtversion %]"></script>
     <script type="text/javascript" src="/pve2/js/pvemanagerlib.js?ver=[% version %]"></script>
     <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js"></script>