Merge branch 'master' into 2019-design

[bookstack] / resources / views / common / header.blade.php

diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index 7f309e21f81b24b67a861ef1215393b2225b1681..67aa6759989c0c41e4adbd073204a3e7a263d7f0 100644 (file)
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -28,8 +28,14 @@
                     @if(signedInUser() && userCan('settings-manage'))
                         <a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
                     @endif
+                    @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage'))
+                        <a href="{{ baseUrl('/settings/users') }}">@icon('users'){{ trans('settings.users') }}</a>
+                    @endif
                     @if(!signedInUser())
-                        <a href="{{ baseUrl('/login') }}">@icon('login'){{ trans('auth.log_in') }}</a>
+                        @if(setting('registration-enabled', false))
+                            <a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
+                        @endif
+                        <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
                     @endif
                 </div>
                 @if(signedInUser())