]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'fix/#1110' of git://github.com/cw1998/BookStack into cw1998-fix/#1110
authorDan Brown <redacted>
Sat, 5 Jan 2019 15:12:33 +0000 (15:12 +0000)
committerDan Brown <redacted>
Sat, 5 Jan 2019 15:12:33 +0000 (15:12 +0000)
1  2 
resources/views/base.blade.php

index 3c144fea88760124e2de8c0aee77511671320a88,535548b3bd282514b67ba39a1a9d089326215e45..c7a5acca80a0398fdfe5bb58fedf9c88f7bf4ef5
                              @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>