Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

change to debian font-awesome

Browse Source 
instead of having font-awesome copied into the repository,
depend on the debian package 'fonts-font-awesome', which provides all we
need

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-06-12 10:13:24 +02:00 committed by Fabian Grünbichler
parent 31cb3622cf
commit 7f3b89a012
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/Service/pveproxy.pm
View File

@ -49,6 +49,7 @@ my $basedirs = {
extjs => '/usr/share/javascript/extjs',
manager => '/usr/share/pve-manager',
docs => '/usr/share/pve-docs',
fontawesome => '/usr/share/fonts-font-awesome',
};
sub init {
@ -73,6 +74,8 @@ sub init {
add_dirs($dirs, '/pve2/images/' => "$basedirs->{manager}/images/");
add_dirs($dirs, '/pve2/css/' => "$basedirs->{manager}/css/");
add_dirs($dirs, '/pve2/js/' => "$basedirs->{manager}/js/");
add_dirs($dirs, '/pve2/fa/fonts/' => "$basedirs->{fontawesome}/fonts/");
add_dirs($dirs, '/pve2/fa/css/' => "$basedirs->{fontawesome}/css/");
add_dirs($dirs, '/pve-docs/' => "$basedirs->{docs}/");
add_dirs($dirs, '/novnc/' => "$basedirs->{novnc}/");

3
debian/control vendored
View File

@ -66,7 +66,8 @@ Depends: libc6 (>= 2.14),
lsb-base,
${perl:Depends},
${misc:Depends},
${shlibs:Depends}
${shlibs:Depends},
fonts-font-awesome
Conflicts: netcat-openbsd, vzdump, vlan
Replaces: vzdump, vlan
Provides: vzdump, vlan

5
www/css/Makefile
View File

@ -2,11 +2,10 @@ include ../../defines.mk
all:
.PHONY: install
install: ext6-pve.css font-awesome.css
.PHONY: install
install: ext6-pve.css
install -d ${WWWCSSDIR}
install -m 0644 $? ${WWWCSSDIR}
set -e && ${MAKE} -C fonts install
.PHONY: clean
clean:

2
www/index.html.tpl
View File

@ -9,7 +9,7 @@
<link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
<link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css" />
<link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css" />
<link rel="stylesheet" type="text/css" href="/pve2/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css" />
[% IF langfile %]
<script type='text/javascript' src='/pve2/locale/pve-lang-[% lang %].js'></script>