proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 00:04:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depend on and use libjs-qrcodejs

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-11-10 13:49:04 +01:00 committed by Thomas Lamprecht
parent e82d35836c
commit 6b2028cb73
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/Service/pveproxy.pm
View File

@ -120,6 +120,9 @@ sub init {
'/proxmoxlib.js' => { '/proxmoxlib.js' => {
file => "$basedirs->{widgettoolkit}/proxmoxlib.js", file => "$basedirs->{widgettoolkit}/proxmoxlib.js",
}, },
'/qrcode.min.js' => {
file => '/usr/share/javascript/qrcodejs/qrcode.min.js',
},
}, },
dirs => $dirs, dirs => $dirs,
}; };

1
debian/control vendored
View File

@ -45,6 +45,7 @@ Depends: apt-transport-https | apt (>= 1.5~),
libfile-readbackwards-perl, libfile-readbackwards-perl,
libfilesys-df-perl, libfilesys-df-perl,
libjs-extjs (>= 7.0.0), libjs-extjs (>= 7.0.0),
libjs-qrcodejs (>= 1.20201119),
libjson-perl, libjson-perl,
liblwp-protocol-https-perl, liblwp-protocol-https-perl,
libnet-dns-perl, libnet-dns-perl,

1
www/Makefile
View File

@ -9,7 +9,6 @@ install:
install -m 0644 index.html.tpl ${WWWBASEDIR} install -m 0644 index.html.tpl ${WWWBASEDIR}
install -d ${WWWJSDIR} install -d ${WWWJSDIR}
install -m 0644 u2f-api.js ${WWWJSDIR} install -m 0644 u2f-api.js ${WWWJSDIR}
install -m 0644 qrcode.min.js ${WWWJSDIR}
.PHONY: check .PHONY: check
check: check:

2
www/index.html.tpl
View File

@ -25,7 +25,7 @@
<script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script> <script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script>
[% END %] [% END %]
<script type="text/javascript" src="/pve2/js/u2f-api.js"></script> <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"> <script type="text/javascript">
Proxmox = { Proxmox = {
Setup: { auth_cookie_name: 'PVEAuthCookie' }, Setup: { auth_cookie_name: 'PVEAuthCookie' },

1
www/qrcode.min.js vendored
View File

File diff suppressed because one or more lines are too long