Default OpenID display name set to standard value

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

diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index 734789899b1e804f65efc8ea2fecbbbc040fbef4..996d44d27a2f635f31a8a47d0518cbe34abe4b4b 100644 (file)
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -2,9 +2,9 @@
     <div class="grid mx-l">
 
         <div>
     <div class="grid mx-l">
 
         <div>

-            <a href="{{ baseUrl('/') }}" class="logo">
+            <a href="{{ url('/') }}" class="logo">

                 @if(setting('app-logo', '') !== 'none')
                 @if(setting('app-logo', '') !== 'none')

-                    <img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
+                    <img class="logo-image" src="{{ setting('app-logo', '') === '' ? url('/logo.png') : url(setting('app-logo', '')) }}" alt="Logo">

                 @endif
                 @if (setting('app-name-header'))
                     <span class="logo-text">{{ setting('app-name') }}</span>
                 @endif
                 @if (setting('app-name-header'))
                     <span class="logo-text">{{ setting('app-name') }}</span>


@@ -15,59 +15,72 @@
 
         <div class="header-search hide-under-l">
             @if (hasAppAccess())
 
         <div class="header-search hide-under-l">
             @if (hasAppAccess())

-            <form action="{{ baseUrl('/search') }}" method="GET" class="search-box">
-                <button id="header-search-box-button" type="submit">@icon('search') </button>
-                <input id="header-search-box-input" type="text" name="term" tabindex="2" placeholder="{{ trans('common.search') }}" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
+            <form action="{{ url('/search') }}" method="GET" class="search-box" role="search">
+                <button id="header-search-box-button" type="submit" aria-label="{{ trans('common.search') }}" tabindex="-1">@icon('search') </button>
+                <input id="header-search-box-input" type="text" name="term"
+                       aria-label="{{ trans('common.search') }}" placeholder="{{ trans('common.search') }}"
+                       value="{{ isset($searchTerm) ? $searchTerm : '' }}">

             </form>
             @endif
         </div>
 
         <div class="text-right">
             </form>
             @endif
         </div>
 
         <div class="text-right">

-            <div class="header-links">
+            <nav class="header-links">

                 <div class="links text-center">
                     @if (hasAppAccess())
                 <div class="links text-center">
                     @if (hasAppAccess())

-                        <a class="hide-over-l" href="{{ baseUrl('/search') }}">@icon('search'){{ trans('common.search') }}</a>
+                        <a class="hide-over-l" href="{{ url('/search') }}">@icon('search'){{ trans('common.search') }}</a>

                         @if(userCanOnAny('view', \BookStack\Entities\Bookshelf::class) || userCan('bookshelf-view-all') || userCan('bookshelf-view-own'))
                         @if(userCanOnAny('view', \BookStack\Entities\Bookshelf::class) || userCan('bookshelf-view-all') || userCan('bookshelf-view-own'))

-                            <a href="{{ baseUrl('/shelves') }}">@icon('bookshelf'){{ trans('entities.shelves') }}</a>
+                            <a href="{{ url('/shelves') }}">@icon('bookshelf'){{ trans('entities.shelves') }}</a>

                         @endif
                         @endif

-                        <a href="{{ baseUrl('/books') }}">@icon('books'){{ trans('entities.books') }}</a>
+                        <a href="{{ url('/books') }}">@icon('books'){{ trans('entities.books') }}</a>

                         @if(signedInUser() && userCan('settings-manage'))
                         @if(signedInUser() && userCan('settings-manage'))

-                            <a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
+                            <a href="{{ url('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>

                         @endif
                         @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage'))
                         @endif
                         @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage'))

-                            <a href="{{ baseUrl('/settings/users') }}">@icon('users'){{ trans('settings.users') }}</a>
+                            <a href="{{ url('/settings/users') }}">@icon('users'){{ trans('settings.users') }}</a>

                         @endif
                     @endif
 
                     @if(!signedInUser())
                         @endif
                     @endif
 
                     @if(!signedInUser())

-                        @if(setting('registration-enabled', false))
-                            <a href="{{ baseUrl('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
+                        @if(setting('registration-enabled') && config('auth.method') === 'standard')
+                            <a href="{{ url('/register') }}">@icon('new-user'){{ trans('auth.sign_up') }}</a>

                         @endif
                         @endif

-                        <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
+                        <a href="{{ url('/login')  }}">@icon('login'){{ trans('auth.log_in') }}</a>

                     @endif
                 </div>
                 @if(signedInUser())
                     <?php $currentUser = user(); ?>
                     @endif
                 </div>
                 @if(signedInUser())
                     <?php $currentUser = user(); ?>

-                    <div class="dropdown-container" dropdown>
-                        <span class="user-name hide-under-l" dropdown-toggle>
+                    <div class="dropdown-container" component="dropdown">
+                        <span class="user-name py-s hide-under-l" refs="dropdown@toggle"
+                              aria-haspopup="true" aria-expanded="false" aria-label="{{ trans('common.profile_menu') }}" tabindex="0">

                             <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
                             <span class="name">{{ $currentUser->getShortName(9) }}</span> @icon('caret-down')
                         </span>
                             <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
                             <span class="name">{{ $currentUser->getShortName(9) }}</span> @icon('caret-down')
                         </span>

-                        <ul class="dropdown-menu">
+                        <ul refs="dropdown@menu" class="dropdown-menu" role="menu">

                             <li>
                             <li>

-                                <a href="{{ baseUrl("/user/{$currentUser->id}") }}">@icon('user'){{ trans('common.view_profile') }}</a>
+                                <a href="{{ url("/user/{$currentUser->id}") }}">@icon('user'){{ trans('common.view_profile') }}</a>

                             </li>
                             <li>
                             </li>
                             <li>

-                                <a href="{{ baseUrl("/settings/users/{$currentUser->id}") }}">@icon('edit'){{ trans('common.edit_profile') }}</a>
+                                <a href="{{ url("/settings/users/{$currentUser->id}") }}">@icon('edit'){{ trans('common.edit_profile') }}</a>

                             </li>
                             <li>
                             </li>
                             <li>

-                                <a href="{{ baseUrl('/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
+                                @if(config('auth.method') === 'saml2')
+                                    <a href="{{ url('/saml2/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
+                                @elseif(config('auth.method') === 'openid')
+                                    <a href="{{ url('/openid/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
+                                @else
+                                    <a href="{{ url('/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
+                                @endif
+                            </li>
+                            <li><hr></li>
+                            <li>
+                                @include('partials.dark-mode-toggle')

                             </li>
                         </ul>
                     </div>
                 @endif
                             </li>
                         </ul>
                     </div>
                 @endif

-            </div>
+            </nav>

         </div>
 
     </div>
         </div>
 
     </div>

-</header>
\ No newline at end of file
+</header>