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>
This commit is contained in:
Dominik Csapak 2018-01-15 15:17:49 +01:00 committed by Thomas Lamprecht
parent 5b46e4322e
commit f90908cb16
3 changed files with 20 additions and 0 deletions

View File

@ -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

1
debian/control vendored
View File

@ -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,

View File

@ -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>