From: Stefan Sterz <s.sterz@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] pveproxy/template: switch to using the "auto" theme per default
Date: Tue, 14 Mar 2023 15:01:59 +0100 [thread overview]
Message-ID: <20230314140203.1107068-4-s.sterz@proxmox.com> (raw)
In-Reply-To: <20230314140203.1107068-1-s.sterz@proxmox.com>
the auto theme uses media queries to detect a users preferred theme,
switch to using it per default instead of the light theme.
Signed-off-by: Stefan Sterz <s.sterz@proxmox.com>
---
PVE/Service/pveproxy.pm | 5 ++++-
www/index.html.tpl | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index 3fd76128..7b305f76 100755
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -215,6 +215,10 @@ sub get_index {
}
}
+ if ($theme eq "") {
+ $theme = "auto"
+ }
+
if (!$lang) {
my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg');
$lang = $dc_conf->{language} // 'en';
@@ -264,7 +268,6 @@ sub get_index {
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 be31dd40..b07ce5f1 100644
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -12,11 +12,11 @@
<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?ver=[% version %]" />
<link rel="stylesheet" type="text/css" href="/pwt/css/ext6-pmx.css?ver=[% wtversion %]" />
- [%- IF theme %]
- [%- IF theme == 'auto' %]
- <link rel="stylesheet" type="text/css" media="(prefers-color-scheme: dark)" href="/pwt/themes/theme-proxmox-dark.css?ver=[% wtversion %]" />
- [%- ELSE %]
+ [%- IF theme != 'crisp' %]
+ [%- IF theme != 'auto' %]
<link rel="stylesheet" type="text/css" href="/pwt/themes/theme-[% theme %].css?ver=[% wtversion %]" />
+ [%- ELSE %]
+ <link rel="stylesheet" type="text/css" media="(prefers-color-scheme: dark)" href="/pwt/themes/theme-proxmox-dark.css?ver=[% wtversion %]" />
[%- END -%]
[%- END -%]
--
2.30.2
next prev parent reply other threads:[~2023-03-14 14:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 14:01 [pve-devel] [PATCH widget-toolkit 0/2] Proxmox Dark Theme Fix-ups Round 2 Stefan Sterz
2023-03-14 14:01 ` [pve-devel] [PATCH widget-toolkit 1/2] utils: move to using the auto theme per default Stefan Sterz
2023-03-14 14:01 ` [pve-devel] [PATCH widget-toolkit 2/2] dark-theme: increase contrast on check-boxes Stefan Sterz
2023-03-14 14:01 ` Stefan Sterz [this message]
2023-03-14 14:15 ` [pve-devel] applied: [PATCH manager] pveproxy/template: switch to using the "auto" theme per default Thomas Lamprecht
2023-03-14 14:15 ` [pve-devel] applied: [PATCH widget-toolkit 0/2] Proxmox Dark Theme Fix-ups Round 2 Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230314140203.1107068-4-s.sterz@proxmox.com \
--to=s.sterz@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox