update shipped appliance info index

[pve-manager.git] / PVE / Service / pveproxy.pm

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 623440213ae86a03eda074dd07f00f06eda8d489..ac1085457f2eff388b0e40fba7ffeac0fd6db7fc 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -47,14 +47,16 @@ sub add_dirs {
 }
 
 my $basedirs = {
-    novnc => '/usr/share/novnc-pve',
-    extjs => '/usr/share/javascript/extjs',
-    manager => '/usr/share/pve-manager',
-    i18n => '/usr/share/pve-i18n',
     docs => '/usr/share/pve-docs',
+    extjs => '/usr/share/javascript/extjs',
     fontawesome => '/usr/share/fonts-font-awesome',
-    xtermjs => '/usr/share/pve-xtermjs',
+    fontlogos => '/usr/share/fonts-font-logos',
+    i18n => '/usr/share/pve-i18n',
+    manager => '/usr/share/pve-manager',
+    novnc => '/usr/share/novnc-pve',
+    sencha_touch => '/usr/share/javascript/sencha-touch',
     widgettoolkit => '/usr/share/javascript/proxmox-widget-toolkit',
+    xtermjs => '/usr/share/pve-xtermjs',
 };
 
 sub init {
@@ -80,9 +82,11 @@ 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}/");
+    add_dirs($dirs, '/pve2/sencha-touch/', "$basedirs->{sencha_touch}/");
     add_dirs($dirs, '/pve2/touch/', "$basedirs->{manager}/touch/");
     add_dirs($dirs, '/pwt/css/' => "$basedirs->{widgettoolkit}/css/");
     add_dirs($dirs, '/pwt/images/' => "$basedirs->{widgettoolkit}/images/");
@@ -219,7 +223,7 @@ sub get_index {
        $lang = $dc_conf->{language} // 'en';
     }
 
-    my $mobile = is_phone($r->header('User-Agent')) && (!defined($args->{mobile}) || $args->{mobile});
+    my $mobile = (is_phone($r->header('User-Agent')) && (!defined($args->{mobile}) || $args->{mobile})) || $args->{mobile};
 
     my $novnc = defined($args->{console}) && $args->{novnc};
     my $xtermjs = defined($args->{console}) && $args->{xtermjs};