Proxmox/pve-http-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-http-server.git synced 2025-01-06 13:17:55 +03:00
Code Releases Activity

re-use Debians jQuery and Bootstrap packages

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-05-22 08:10:58 +02:00
parent e52d940029
commit 88628fd141
5 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Makefile
View File

@ -12,25 +12,6 @@ DESTDIR=
PERL5DIR=${DESTDIR}/usr/share/perl5
DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}
WWWCSSDIR=${WWWBASEDIR}/css
WWWFONTSDIR=${WWWBASEDIR}/fonts
WWWJSDIR=${WWWBASEDIR}/js
# bootstrap library
BTVER=3.4.1
BTDIR=bootstrap-${BTVER}-dist
BTSRC=${BTDIR}.zip
BTDATA = \
${BTDIR}/css/bootstrap.min.css \
${BTDIR}/css/bootstrap-theme.min.css \
${BTDIR}/js/bootstrap.min.js \
${BTDIR}/fonts/glyphicons-halflings-regular.ttf
JQVER=3.4.1
JQSRC=jquery-${JQVER}.min.js
all:
.PHONY: deb
@ -42,22 +23,7 @@ ${DEB}:
cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
lintian ${DEB}
download_bootstrap:
rm -f ${BTSRC}$ ${BTSRC}.tmp
wget https://github.com/twbs/bootstrap/releases/download/v${BTVER}/${BTSRC} -O ${BTSRC}.tmp
mv ${BTSRC}.tmp ${BTSRC}
download_jquery:
rm -f ${JQSRC} ${JQSRC}.tmp
wget https://code.jquery.com/jquery-${JQVER}.min.js -O ${JQSRC}.tmp
mv ${JQSRC}.tmp ${JQSRC}
${BTDATA}: ${BTDIR}
${BTDIR}: ${BTSRC}
rm -rf ${BTDIR}
unzip -x ${BTSRC}
install: ${BTDATA}
install: PVE
install -d -m 755 ${PERL5DIR}/PVE/APIServer
install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
@ -66,17 +32,6 @@ install: ${BTDATA}
install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
# install bootstrap and jquery
install -d -m 755 ${WWWBASEDIR}
install -d -m 755 ${WWWCSSDIR}
install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap.min.css ${WWWCSSDIR}
install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap-theme.min.css ${WWWCSSDIR}
install -d -m 755 ${WWWJSDIR}
install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR}
install -m 0644 -o www-data -g www-data ${JQSRC} ${WWWJSDIR}
install -d -m 755 ${WWWFONTSDIR}
install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWFONTSDIR}
.PHONY: upload
upload: ${DEB}

6
PVE/APIServer/Formatter/Bootstrap.pm
View File

@ -101,7 +101,7 @@ sub body {
<title>$self->{title}</title>
<!-- Bootstrap -->
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/js/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script type="text/javascript">
$jssetup
@ -115,9 +115,9 @@ body {
</style>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="/js/jquery-3.4.1.min.js"></script>
<script src="/js/jquery/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap/js/bootstrap.min.js"></script>
</head>
<body>

BIN
bootstrap-3.4.1-dist.zip
View File

Binary file not shown.

2
debian/control vendored
View File

@ -17,6 +17,8 @@ Depends: libanyevent-http-perl,
libhttp-date-perl,
libhttp-message-perl,
libio-socket-ssl-perl,
libjs-jquery,
libjs-bootstrap,
libjson-perl,
libnet-ip-perl,
libpve-common-perl,

2
jquery-3.4.1.min.js vendored
View File

File diff suppressed because one or more lines are too long