maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

respect custom-theme variants in UI::getTheme(); add margin to customer-services dashboard-badges

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-11-26 09:24:44 +01:00
parent 7e0073f4a3
commit 75cf44a6d2
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/UI/Panel/UI.php
View File

@@ -321,6 +321,10 @@ class UI
} }
} }
} }
// check for template-variant
if (preg_match("/([a-z0-9.\-]+)_([a-z0-9.\-]+)/i", $theme, $matches)) {
$theme = $matches[1];
}
if (!file_exists(Froxlor::getInstallDir() . '/templates/' . $theme)) { if (!file_exists(Froxlor::getInstallDir() . '/templates/' . $theme)) {
PhpHelper::phpErrHandler(E_USER_WARNING, "Theme '" . $theme . "' could not be found.", __FILE__, __LINE__); PhpHelper::phpErrHandler(E_USER_WARNING, "Theme '" . $theme . "' could not be found.", __FILE__, __LINE__);
$theme = self::$default_theme; $theme = self::$default_theme;

2
lib/init.php
View File

@@ -188,7 +188,7 @@ if (Update::versionInUpdate(Settings::Get('panel.version'), '2.0.0-beta1')) {
// Check if a different variant of the theme is used // Check if a different variant of the theme is used
$themevariant = "default"; $themevariant = "default";
if (preg_match("/([a-z0-9\.\-]+)_([a-z0-9\.\-]+)/i", $theme, $matches)) { if (preg_match("/([a-z0-9.\-]+)_([a-z0-9.\-]+)/i", $theme, $matches)) {
$theme = $matches[1]; $theme = $matches[1];
$themevariant = $matches[2]; $themevariant = $matches[2];
} }

8
templates/Froxlor/user/index.html.twig
View File

@@ -174,16 +174,16 @@
<div class="ms-2 me-auto"> <div class="ms-2 me-auto">
<div class="fw-bold">{{ lng('customer.services') }}</div> <div class="fw-bold">{{ lng('customer.services') }}</div>
{% if userinfo.imap == 1 %} {% if userinfo.imap == 1 %}
<span class="badge bg-success">IMAP</span> <span class="badge bg-success me-1">IMAP</span>
{% endif %} {% endif %}
{% if userinfo.pop3 == 1 %} {% if userinfo.pop3 == 1 %}
<span class="badge bg-success">POP3</span> <span class="badge bg-success me-1">POP3</span>
{% endif %} {% endif %}
{% if userinfo.phpenabled == 1 %} {% if userinfo.phpenabled == 1 %}
<span class="badge bg-success">PHP</span> <span class="badge bg-success me-1">PHP</span>
{% endif %} {% endif %}
{% if userinfo.perlenabled == 1 %} {% if userinfo.perlenabled == 1 %}
<span class="badge bg-success">Perl/CGI</span> <span class="badge bg-success me-1">Perl/CGI</span>
{% endif %} {% endif %}
{% if userinfo.api_allowed == 1 %} {% if userinfo.api_allowed == 1 %}
<a href="{{ linker({'section':'index','page':'apikeys'}) }}"> <a href="{{ linker({'section':'index','page':'apikeys'}) }}">