From: Dan Brown <redacted>
Date: Sat, 5 Jan 2019 15:12:33 +0000 (+0000)
Subject: Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110
X-Git-Tag: v0.25.0~1^2~4^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/f63fd4beca0c04a56db7dcb8b88c2caaf4e39f81

Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110
---

f63fd4beca0c04a56db7dcb8b88c2caaf4e39f81
diff --cc resources/views/base.blade.php
index 3c144fea8,535548b3b..c7a5acca8
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@@ -55,10 -55,10 +55,13 @@@
                              @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())
 +                                @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>