expose font-logos via API server and load in UI

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
Tested-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 9e8a2fecdcc3eece3544713ab686d1e95e93e68f..ac1085457f2eff388b0e40fba7ffeac0fd6db7fc 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -50,6 +50,7 @@ my $basedirs = {
     docs => '/usr/share/pve-docs',
     extjs => '/usr/share/javascript/extjs',
     fontawesome => '/usr/share/fonts-font-awesome',
+    fontlogos => '/usr/share/fonts-font-logos',
     i18n => '/usr/share/pve-i18n',
     manager => '/usr/share/pve-manager',
     novnc => '/usr/share/novnc-pve',
@@ -81,6 +82,7 @@ sub init {
     add_dirs($dirs, '/pve2/ext6/', "$basedirs->{extjs}/");
     add_dirs($dirs, '/pve2/fa/css/' =>  "$basedirs->{fontawesome}/css/");
     add_dirs($dirs, '/pve2/fa/fonts/' =>  "$basedirs->{fontawesome}/fonts/");
+    add_dirs($dirs, '/pve2/font-logos/' =>  "$basedirs->{fontlogos}/");
     add_dirs($dirs, '/pve2/images/' =>  "$basedirs->{manager}/images/");
     add_dirs($dirs, '/pve2/js/' =>  "$basedirs->{manager}/js/");
     add_dirs($dirs, '/pve2/locale/', "$basedirs->{i18n}/");

diff --git a/debian/control b/debian/control
index 259376d3666033902475cab3abd4e6742a847883..3666e337e0cdd079dcd9eb2ec0fcf85b085f2e60 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Depends: apt (>= 1.5~),
          cstream,
          dtach,
          fonts-font-awesome,
+         fonts-font-logos,
          gdisk,
          hdparm,
          ifupdown2 (>= 3.0) | ifenslave (>= 2.6),

diff --git a/www/index.html.tpl b/www/index.html.tpl
index b07ce5f175bb2067f9d78860346b2f9fff59cdfa..46dc877bcaf249d8f1063d7210d28c27f459bdd3 100644 (file)
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -10,6 +10,7 @@
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css?ver=7.0.0" />
     <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css?ver=7.0.0" />
     <link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
+    <link rel="stylesheet" type="text/css" href="/pve2/font-logos/css/font-logos.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css?ver=[% version %]" />
     <link rel="stylesheet" type="text/css" href="/pwt/css/ext6-pmx.css?ver=[% wtversion %]" />
     [%- IF theme != 'crisp' %]