From 5137b16fd2e2618b37b82b0b5423e091c8117eb8 Mon Sep 17 00:00:00 2001 From: Stefan Sterz Date: Wed, 8 Mar 2023 17:40:07 +0100 Subject: [PATCH] pveproxy/template: add support for switching themes load the dark theme only if requested through a cookie, also adds support for the "auto" theme that uses the dark theme based on a media query. this requires a bump of the widget toolkit so the dark-theme css file is available. Signed-off-by: Stefan Sterz --- PVE/Service/pveproxy.pm | 13 +++++++++++++ www/index.html.tpl | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index f73fdd6f..3fd76128 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -88,6 +88,7 @@ sub init { add_dirs($dirs, '/xtermjs/' => "$basedirs->{xtermjs}/"); add_dirs($dirs, '/pwt/images/' => "$basedirs->{widgettoolkit}/images/"); add_dirs($dirs, '/pwt/css/' => "$basedirs->{widgettoolkit}/css/"); + add_dirs($dirs, '/pwt/themes/' => "$basedirs->{widgettoolkit}/themes/"); $self->{server_config} = { title => 'Proxmox VE API', @@ -191,6 +192,7 @@ sub get_index { my $lang; my $username; my $token = 'null'; + my $theme = ""; if (my $cookie = $r->header('Cookie')) { if (my $newlang = ($cookie =~ /(?:^|\s)PVELangCookie=([^;]*)/)[0]) { @@ -198,6 +200,15 @@ sub get_index { $lang = $newlang; } } + + if (my $newtheme = ($cookie =~ /(?:^|\s)PVEThemeCookie=([^;]*)/)[0]) { + # theme names need to be kebab case, with each segment a maximum of 10 characters long + # and at most 6 segments + if ($newtheme =~ m/^[a-z]{1,10}(-[a-z]{1,10}){0,5}$/) { + $theme = $newtheme; + } + } + my $ticket = PVE::APIServer::Formatter::extract_auth_value($cookie, $server->{cookie_name}); if (($username = PVE::AccessControl::verify_ticket($ticket, 1))) { $token = PVE::AccessControl::assemble_csrf_prevention_token($username); @@ -252,6 +263,8 @@ sub get_index { debug => $debug, version => "$version", wtversion => $wtversion, + theme => $theme, + auto => $theme == "auto", }; # by default, load the normal index diff --git a/www/index.html.tpl b/www/index.html.tpl index 0c819977..be31dd40 100644 --- a/www/index.html.tpl +++ b/www/index.html.tpl @@ -12,6 +12,14 @@ + [%- IF theme %] + [%- IF theme == 'auto' %] + + [%- ELSE %] + + [%- END -%] + [%- END -%] + [% IF langfile %] [%- ELSE %]