From 92f3f4ee576d4d7e2f00520f67c865265d790d42 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Thu, 13 Jun 2019 19:06:02 +0200 Subject: [PATCH] added config to brand Kimai with logo and company name (#856) --- src/DependencyInjection/Configuration.php | 14 ++++++++++++++ templates/base.html.twig | 12 ++++++++++-- templates/partials/logo_login.html.twig | 8 +++++++- tests/DependencyInjection/AppExtensionTest.php | 7 ++++++- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 249b79e4..0dda8e13 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -326,6 +326,20 @@ class Configuration implements ConfigurationInterface ->scalarNode('height')->defaultValue('200')->end() ->end() ->end() + ->arrayNode('branding') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('logo') + ->defaultNull() + ->end() + ->scalarNode('mini') + ->defaultNull() + ->end() + ->scalarNode('company') + ->defaultNull() + ->end() + ->end() + ->end() ->end() ; diff --git a/templates/base.html.twig b/templates/base.html.twig index 3419a726..82c47fcc 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -42,11 +42,19 @@ {% block page_subtitle %}{% endblock %} {% block logo_mini %} - KTT + {% if not kimai_context.branding.mini is empty %} + {{ kimai_context.branding.mini|raw }} + {% else %} + KTT + {% endif %} {% endblock %} {% block logo_large %} - Kimai - Time Tracking + {% if not kimai_context.branding.company is empty %} + {{ kimai_context.branding.company|raw }} + {% else %} + Kimai - Time Tracking + {% endif %} {% endblock %} {% block footer %} diff --git a/templates/partials/logo_login.html.twig b/templates/partials/logo_login.html.twig index efff5158..69ce2a85 100644 --- a/templates/partials/logo_login.html.twig +++ b/templates/partials/logo_login.html.twig @@ -1 +1,7 @@ -{{- get_title('', '
')|raw -}} +{% if not kimai_context.branding.logo is empty %} + +{% elseif not kimai_context.branding.company is empty %} + {{ kimai_context.branding.company|raw }} +{% else %} + {{- get_title('', '
')|raw -}} +{% endif %} diff --git a/tests/DependencyInjection/AppExtensionTest.php b/tests/DependencyInjection/AppExtensionTest.php index cd212c63..7eb97d35 100644 --- a/tests/DependencyInjection/AppExtensionTest.php +++ b/tests/DependencyInjection/AppExtensionTest.php @@ -102,7 +102,12 @@ class AppExtensionTest extends TestCase 'border_color' => '#3b8bba', 'grid_color' => 'rgba(0,0,0,.05)', 'height' => '200' - ] + ], + 'branding' => [ + 'logo' => null, + 'mini' => null, + 'company' => null, + ], ], 'kimai.theme.select_type' => null, 'kimai.theme.show_about' => true,