diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index 8b821154..0904127f 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -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}/"); diff --git a/debian/control b/debian/control index d65d9312..bea96c12 100644 --- a/debian/control +++ b/debian/control @@ -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 diff --git a/www/css/Makefile b/www/css/Makefile index 449f6f4f..3960292c 100644 --- a/www/css/Makefile +++ b/www/css/Makefile @@ -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: diff --git a/www/index.html.tpl b/www/index.html.tpl index aa87aebc..9abe09ef 100644 --- a/www/index.html.tpl +++ b/www/index.html.tpl @@ -9,7 +9,7 @@ - + [% IF langfile %]