mirror of
https://git.proxmox.com/git/pve-manager
synced 2025-08-04 13:54:26 +00:00
depend on and use libjs-qrcodejs
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
e82d35836c
commit
6b2028cb73
@ -120,6 +120,9 @@ sub init {
|
||||
'/proxmoxlib.js' => {
|
||||
file => "$basedirs->{widgettoolkit}/proxmoxlib.js",
|
||||
},
|
||||
'/qrcode.min.js' => {
|
||||
file => '/usr/share/javascript/qrcodejs/qrcode.min.js',
|
||||
},
|
||||
},
|
||||
dirs => $dirs,
|
||||
};
|
||||
|
1
debian/control
vendored
1
debian/control
vendored
@ -45,6 +45,7 @@ Depends: apt-transport-https | apt (>= 1.5~),
|
||||
libfile-readbackwards-perl,
|
||||
libfilesys-df-perl,
|
||||
libjs-extjs (>= 7.0.0),
|
||||
libjs-qrcodejs (>= 1.20201119),
|
||||
libjson-perl,
|
||||
liblwp-protocol-https-perl,
|
||||
libnet-dns-perl,
|
||||
|
@ -9,7 +9,6 @@ install:
|
||||
install -m 0644 index.html.tpl ${WWWBASEDIR}
|
||||
install -d ${WWWJSDIR}
|
||||
install -m 0644 u2f-api.js ${WWWJSDIR}
|
||||
install -m 0644 qrcode.min.js ${WWWJSDIR}
|
||||
|
||||
.PHONY: check
|
||||
check:
|
||||
|
@ -25,7 +25,7 @@
|
||||
<script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script>
|
||||
[% END %]
|
||||
<script type="text/javascript" src="/pve2/js/u2f-api.js"></script>
|
||||
<script type="text/javascript" src="/pve2/js/qrcode.min.js"></script>
|
||||
<script type="text/javascript" src="/qrcode.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
Proxmox = {
|
||||
Setup: { auth_cookie_name: 'PVEAuthCookie' },
|
||||
|
1
www/qrcode.min.js
vendored
1
www/qrcode.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user