added missing comma that caused the testprocess to fail.

[bookstack] / resources / views / users / edit.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index d6a4563ea71f1874ea1e9bb37f2da4d60787f866..f78c25cebf6a93a00a82975b8ba09c308505a730 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -7,16 +7,16 @@
             @include('settings.navbar', ['selected' => 'users'])
         </div>
 
             @include('settings.navbar', ['selected' => 'users'])
         </div>
 

-        <div class="card content-wrap">
+        <section class="card content-wrap">

             <h1 class="list-heading">{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
             <h1 class="list-heading">{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>

-            <form action="{{ baseUrl("/settings/users/{$user->id}") }}" method="post">
+            <form action="{{ url("/settings/users/{$user->id}") }}" method="post" enctype="multipart/form-data">

                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="PUT">
 
                 <div class="setting-list">
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="PUT">
 
                 <div class="setting-list">

-                    @include('users.forms.' . $authMethod, ['model' => $user])
+                    @include('users.form', ['model' => $user, 'authMethod' => $authMethod])

 
 

-                    <div class="grid half large-gap">
+                    <div class="grid half gap-xl">

                         <div>
                             <label for="user-avatar" class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
                             <p class="small">{{ trans('settings.users_avatar_desc') }}</p>
                         <div>
                             <label for="user-avatar" class="setting-list-label">{{ trans('settings.users_avatar') }}</label>
                             <p class="small">{{ trans('settings.users_avatar_desc') }}</p>


@@ -26,23 +26,26 @@
                                 'resizeHeight' => '512',
                                 'resizeWidth' => '512',
                                 'showRemove' => false,
                                 'resizeHeight' => '512',
                                 'resizeWidth' => '512',
                                 'showRemove' => false,

-                                'defaultImage' => baseUrl('/user_avatar.png'),
+                                'defaultImage' => url('/user_avatar.png'),

                                 'currentImage' => $user->getAvatar(80),
                                 'currentId' => $user->image_id,
                                 'currentImage' => $user->getAvatar(80),
                                 'currentId' => $user->image_id,

-                                'name' => 'image_id',
+                                'name' => 'profile_image',

                                 'imageClass' => 'avatar large'
                             ])
                         </div>
                     </div>
 
                                 'imageClass' => 'avatar large'
                             ])
                         </div>
                     </div>
 

-                    <div class="grid half large-gap">
+                    <div class="grid half gap-xl v-center">

                         <div>
                             <label for="user-language" class="setting-list-label">{{ trans('settings.users_preferred_language') }}</label>
                         <div>
                             <label for="user-language" class="setting-list-label">{{ trans('settings.users_preferred_language') }}</label>

+                            <p class="small">
+                                {{ trans('settings.users_preferred_language_desc') }}
+                            </p>

                         </div>
                         <div>
                             <select name="setting[language]" id="user-language">
                                 @foreach(trans('settings.language_select') as $lang => $label)
                         </div>
                         <div>
                             <select name="setting[language]" id="user-language">
                                 @foreach(trans('settings.language_select') as $lang => $label)

-                                    <option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
+                                    <option @if(setting()->getUser($user, 'language', config('app.default_locale')) === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>

                                 @endforeach
                             </select>
                         </div>
                                 @endforeach
                             </select>
                         </div>


@@ -51,38 +54,43 @@
                 </div>
 
                 <div class="text-right">
                 </div>
 
                 <div class="text-right">

-                    <a href="{{  baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <a href="{{  url($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>

                     @if($authMethod !== 'system')
                     @if($authMethod !== 'system')

-                        <a href="{{ baseUrl("/settings/users/{$user->id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }}</a>
+                        <a href="{{ url("/settings/users/{$user->id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }}</a>

                     @endif
                     @endif

-                    <button class="button primary" type="submit">{{ trans('common.save') }}</button>
+                    <button class="button" type="submit">{{ trans('common.save') }}</button>

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

-        </div>
+        </section>

 
         @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)
 
         @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)

-            <div class="card content-wrap auto-height">
+            <section class="card content-wrap auto-height">

                 <h2 class="list-heading">{{ trans('settings.users_social_accounts') }}</h2>
                 <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
                 <div class="container">
                     <div class="grid third">
                         @foreach($activeSocialDrivers as $driver => $enabled)
                             <div class="text-center mb-m">
                 <h2 class="list-heading">{{ trans('settings.users_social_accounts') }}</h2>
                 <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
                 <div class="container">
                     <div class="grid third">
                         @foreach($activeSocialDrivers as $driver => $enabled)
                             <div class="text-center mb-m">

-                                <div>@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div>
+                                <div role="presentation">@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])</div>

                                 <div>
                                     @if($user->hasSocialAccount($driver))
                                 <div>
                                     @if($user->hasSocialAccount($driver))

-                                        <a href="{{ baseUrl("/login/service/{$driver}/detach") }}" class="button small outline">{{ trans('settings.users_social_disconnect') }}</a>
+                                        <a href="{{ url("/login/service/{$driver}/detach") }}" aria-label="{{ trans('settings.users_social_disconnect') }} - {{ $driver }}"
+                                           class="button small outline">{{ trans('settings.users_social_disconnect') }}</a>

                                     @else
                                     @else

-                                        <a href="{{ baseUrl("/login/service/{$driver}") }}" class="button small outline">{{ trans('settings.users_social_connect') }}</a>
+                                        <a href="{{ url("/login/service/{$driver}") }}" aria-label="{{ trans('settings.users_social_connect') }} - {{ $driver }}"
+                                           class="button small outline">{{ trans('settings.users_social_connect') }}</a>

                                     @endif
                                 </div>
                             </div>
                         @endforeach
                     </div>
                 </div>
                                     @endif
                                 </div>
                             </div>
                         @endforeach
                     </div>
                 </div>

-            </div>
+            </section>
+        @endif
+
+        @if(($currentUser->id === $user->id && userCan('access-api')) || userCan('users-manage'))
+            @include('users.api-tokens.list', ['user' => $user])

         @endif
     </div>
 
         @endif
     </div>
 

-    @include('components.image-manager', ['imageType' => 'user'])
-@stop
\ No newline at end of file
+@stop