diff options
Diffstat (limited to 'resources/views/layouts')
| -rw-r--r-- | resources/views/layouts/app.twig | 2 | ||||
| -rw-r--r-- | resources/views/layouts/parts/navbar.twig | 5 |
2 files changed, 4 insertions, 3 deletions
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')) %} <!DOCTYPE html> <html lang="{{ session_get('locale')|split('_')[0]|escape('html_attr') }}"> <head> 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 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="{{ url('/') }}"> - <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">{{ config('app_name')|upper }}</strong> + <span class="icon-icon_angel"></span> + <strong class="visible-lg-inline">{{ config('app_name')|upper }}</strong> </a> </div> @@ -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') %} |