From d15946df2dfb0ae2f0ca9371e5c8071df91ab45a Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 8 Oct 2018 19:30:37 +0200 Subject: Changed `src/` code and templates to use the new user model --- resources/views/layouts/app.twig | 2 +- resources/views/layouts/parts/navbar.twig | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'resources/views/layouts') diff --git a/resources/views/layouts/app.twig b/resources/views/layouts/app.twig index ed0d96af..fcbcc665 100644 --- a/resources/views/layouts/app.twig +++ b/resources/views/layouts/app.twig @@ -1,4 +1,4 @@ -{% set theme = user.color|default(config('theme')) %} +{% set theme = user.settings.theme|default(config('theme')) %} diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig index 22797a7a..61c6a10b 100644 --- a/resources/views/layouts/parts/navbar.twig +++ b/resources/views/layouts/parts/navbar.twig @@ -21,7 +21,8 @@ - {{ config('app_name')|upper }} + + {{ config('app_name')|upper }} @@ -51,7 +52,7 @@ {{ menuUserHints() }} {% if has_permission_to('user_myshifts') %} - {{ elements.toolbar_item(user.Nick, url('users', {'action': 'view'}), 'users', 'icon icon-icon_angel') }} + {{ elements.toolbar_item(user.name, url('users', {'action': 'view'}), 'users', 'icon icon-icon_angel') }} {% endif %} {% if has_permission_to('user_settings') or has_permission_to('logout') %} -- cgit v1.2.3-54-g00ecf