diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 9a23fe2a1..1ba8b97db 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -231,7 +231,6 @@ class RegisterController extends Controller return redirect('/register/confirm'); } - $this->emailConfirmationService->sendConfirmation($user); session()->flash('success', trans('auth.email_confirm_resent')); return redirect('/register/confirm'); } diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php index 3d1d45c3b..bb92a1d7c 100644 --- a/app/Services/SearchService.php +++ b/app/Services/SearchService.php @@ -92,7 +92,7 @@ class SearchService return [ 'total' => $total, 'count' => count($results), - 'results' => $results->sortByDesc('score') + 'results' => $results->sortByDesc('score')->values() ]; } diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 94752f26e..657bbed17 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -237,8 +237,8 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] { padding: 0; cursor: pointer; position: absolute; - left: 7px; - top: 7px; + left: 8px; + top: 9.5px; } input { display: block; diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss index 2911a88c6..719126526 100644 --- a/resources/assets/sass/_text.scss +++ b/resources/assets/sass/_text.scss @@ -378,12 +378,6 @@ span.sep { display: block; } -.action-header { - h1 { - margin-top: $-m; - } -} - /** * Icons */ diff --git a/resources/views/auth/register-confirm.blade.php b/resources/views/auth/register-confirm.blade.php index 364df9266..5d945ef81 100644 --- a/resources/views/auth/register-confirm.blade.php +++ b/resources/views/auth/register-confirm.blade.php @@ -9,9 +9,11 @@ @section('content')
-
-

{{ trans('auth.register_thanks') }}

-

{{ trans('auth.register_confirm', ['appName' => setting('app-name')]) }}

+
+

{{ trans('auth.register_thanks') }}

+
+

{{ trans('auth.register_confirm', ['appName' => setting('app-name')]) }}

+
diff --git a/resources/views/auth/user-unconfirmed.blade.php b/resources/views/auth/user-unconfirmed.blade.php index 13567b412..22c26d92b 100644 --- a/resources/views/auth/user-unconfirmed.blade.php +++ b/resources/views/auth/user-unconfirmed.blade.php @@ -2,29 +2,33 @@ @section('content') -
-
-

{{ trans('auth.email_not_confirmed') }}

-

{{ trans('auth.email_not_confirmed_text') }}
- {{ trans('auth.email_not_confirmed_click_link') }}
- {{ trans('auth.email_not_confirmed_resend') }} -

-
-
- {!! csrf_field() !!} -
- - @if(auth()->check()) - @include('form/text', ['name' => 'email', 'model' => auth()->user()]) - @else - @include('form/text', ['name' => 'email']) - @endif -
-
- -
-
+
+

 

+
+

{{ trans('auth.email_not_confirmed') }}

+
+

{{ trans('auth.email_not_confirmed_text') }}
+ {{ trans('auth.email_not_confirmed_click_link') }}
+ {{ trans('auth.email_not_confirmed_resend') }} +

+
+
+ {!! csrf_field() !!} +
+ + @if(auth()->check()) + @include('form/text', ['name' => 'email', 'model' => auth()->user()]) + @else + @include('form/text', ['name' => 'email']) + @endif +
+
+ +
+
+
+
@stop diff --git a/resources/views/partials/activity-list.blade.php b/resources/views/partials/activity-list.blade.php index 0dc38091e..45322a1e5 100644 --- a/resources/views/partials/activity-list.blade.php +++ b/resources/views/partials/activity-list.blade.php @@ -8,5 +8,5 @@ @endforeach
@else -

{{ trans('common.no_activity') }}

+

{{ trans('common.no_activity') }}

@endif \ No newline at end of file diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index 1029b65fa..2c967d0a9 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -1,213 +1,204 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') +@section('toolbar') +
+
+ {{ trans('entities.search_for_term', ['term' => $searchTerm]) }} +
+
+@stop - +@section('container-attrs') + id="search-system" + ng-non-bindable="" +@stop -
+@section('sidebar') +
+

{{ trans('entities.search_filters') }}

-
-
-
-
-
- {{ trans('entities.search_for_term', ['term' => $searchTerm]) }} -
+
+
+
{{ trans('entities.search_content_type') }}
+
+ + +
-
-
-
-
+
{{ trans('entities.search_exact_matches') }}
+ + + + + + + + +
+ + +
+ +
-
+
{{ trans('entities.search_tags') }}
+ + + + + + + + +
+ + +
+ +
-
-

{{ trans('entities.search_results') }}

-
{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}
- @include('partials/entity-list', ['entities' => $entities]) - @if ($hasNextPage) - {{ trans('entities.search_more') }} - @endif -
+
Options
+ + + + + -
-

{{ trans('entities.search_filters') }}

+
Date Options
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ trans('entities.search_updated_after') }} + - -
{{ trans('entities.search_content_type') }}
-
- - - -
+
+ + + +
{{ trans('entities.search_updated_before') }} + -
{{ trans('entities.search_exact_matches') }}
- - - - - - - - -
- - -
- -
+
+ + + +
{{ trans('entities.search_created_after') }} + -
{{ trans('entities.search_tags') }}
- - - - - - - - -
- - -
- -
+
+ + + +
{{ trans('entities.search_created_before') }} + -
Options
- - - - - - -
Date Options
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ trans('entities.search_updated_after') }} - - -
- - - -
{{ trans('entities.search_updated_before') }} - - -
- - - -
{{ trans('entities.search_created_after') }} - - -
- - - -
{{ trans('entities.search_created_before') }} - - -
- - - -
+
+ + + +
- - - - -
- + +
-
-
+@stop +@section('body') + +
+ + +

{{ trans('entities.search_results') }}

+
{{ trans_choice('entities.search_total_results_found', $totalResults, ['count' => $totalResults]) }}
+ @include('partials/entity-list', ['entities' => $entities]) + @if ($hasNextPage) + {{ trans('entities.search_more') }} + @endif +
@stop \ No newline at end of file diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index c736bc24e..18d8b1307 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -1,128 +1,141 @@ -@extends('base') - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'settings']) +@stop -
+@section('body') +
-

{{ trans('settings.settings') }}

+
+
+ BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }} +
-
- {!! csrf_field() !!} +
+

{{ trans('settings.app_settings') }}

+
+ + {!! csrf_field() !!} +
-

{{ trans('settings.app_settings') }}

+
+
+ +

{{ trans('settings.app_name_desc') }}

+ +
+
+ + @include('components.toggle-switch', ['name' => 'setting-app-name-header', 'value' => setting('app-name-header')]) +
+
+ + @include('components.toggle-switch', ['name' => 'setting-app-public', 'value' => setting('app-public')]) +
+
+ +

{{ trans('settings.app_secure_images_desc') }}

+ @include('components.toggle-switch', ['name' => 'setting-app-secure-images', 'value' => setting('app-secure-images')]) +
+
+ +

{{ trans('settings.app_editor_desc') }}

+ +
+
-
+
+
+ +

{!! trans('settings.app_logo_desc') !!}

+ + @include('components.image-picker', [ + 'resizeHeight' => '43', + 'resizeWidth' => '200', + 'showRemove' => true, + 'defaultImage' => baseUrl('/logo.png'), + 'currentImage' => setting('app-logo'), + 'name' => 'setting-app-logo', + 'imageClass' => 'logo-image', + 'currentId' => false + ]) + +
+
+ +

{!! trans('settings.app_primary_color_desc') !!}

+ + +
+
+ +
-
- -

{{ trans('settings.app_name_desc') }}

- + +

{{ trans('settings.app_custom_html_desc') }}

+
-
- - @include('components.toggle-switch', ['name' => 'setting-app-name-header', 'value' => setting('app-name-header')]) -
-
- - @include('components.toggle-switch', ['name' => 'setting-app-public', 'value' => setting('app-public')]) -
-
- -

{{ trans('settings.app_secure_images_desc') }}

- @include('components.toggle-switch', ['name' => 'setting-app-secure-images', 'value' => setting('app-secure-images')]) -
-
- -

{{ trans('settings.app_editor_desc') }}

- -
-
- -
-
- -

{!! trans('settings.app_logo_desc') !!}

- - @include('components.image-picker', [ - 'resizeHeight' => '43', - 'resizeWidth' => '200', - 'showRemove' => true, - 'defaultImage' => baseUrl('/logo.png'), - 'currentImage' => setting('app-logo'), - 'name' => 'setting-app-logo', - 'imageClass' => 'logo-image', - 'currentId' => false - ]) +
+
-
- -

{!! trans('settings.app_primary_color_desc') !!}

- - -
-
- +
+
-
- -

{{ trans('settings.app_custom_html_desc') }}

- -
+

 

-
+
+

{{ trans('settings.reg_settings') }}

+
+
+ {!! csrf_field() !!} -

{{ trans('settings.reg_settings') }}

- -
-
-
- - @include('components.toggle-switch', ['name' => 'setting-registration-enabled', 'value' => setting('registration-enabled')]) -
-
- - has('setting-registration-role')) class="neg" @endif> + @foreach(\BookStack\Role::all() as $role) + - @endforeach - + {{ $role->display_name }} + + @endforeach + +
+
+ +

{{ trans('settings.reg_confirm_email_desc') }}

+ @include('components.toggle-switch', ['name' => 'setting-registration-confirmation', 'value' => setting('registration-confirmation')]) +
+
+
+
+ +

{!! trans('settings.reg_confirm_restrict_domain_desc') !!}

+ +
+
-
- -

{{ trans('settings.reg_confirm_email_desc') }}

- @include('components.toggle-switch', ['name' => 'setting-registration-confirmation', 'value' => setting('registration-confirmation')]) -
-
-
-
- -

{!! trans('settings.reg_confirm_restrict_domain_desc') !!}

- -
-
-
-
- -
- - BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }} - - +
+ +
+
- +
+
diff --git a/resources/views/settings/navbar.blade.php b/resources/views/settings/navbar.blade.php index 15000b1cf..32ac4f426 100644 --- a/resources/views/settings/navbar.blade.php +++ b/resources/views/settings/navbar.blade.php @@ -1,18 +1,12 @@ -
-
-
-
- @if($currentUser->can('settings-manage')) - {{ trans('settings.settings') }} - @endif - @if($currentUser->can('users-manage')) - {{ trans('settings.users') }} - @endif - @if($currentUser->can('user-roles-manage')) - {{ trans('settings.roles') }} - @endif -
-
-
+
+ @if($currentUser->can('settings-manage')) + {{ trans('settings.settings') }} + @endif + @if($currentUser->can('users-manage')) + {{ trans('settings.users') }} + @endif + @if($currentUser->can('user-roles-manage')) + {{ trans('settings.roles') }} + @endif
\ No newline at end of file diff --git a/resources/views/settings/roles/create.blade.php b/resources/views/settings/roles/create.blade.php index bae42540c..e61922da6 100644 --- a/resources/views/settings/roles/create.blade.php +++ b/resources/views/settings/roles/create.blade.php @@ -1,15 +1,17 @@ -@extends('base') - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'roles']) +@stop -
-

{{ trans('settings.role_create') }}

+@section('body') -
- @include('settings/roles/form') -
-
+
+
+
+ @include('settings/roles/form', ['title' => trans('settings.role_create'), 'icon' => 'plus']) +
+
+
@stop diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php index 0b8e1626f..8002cd4bd 100644 --- a/resources/views/settings/roles/delete.blade.php +++ b/resources/views/settings/roles/delete.blade.php @@ -1,28 +1,36 @@ -@extends('base') - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'roles']) - -
-

{{ trans('settings.role_delete') }}

-

{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}

- -
id}") }}" method="POST"> - {!! csrf_field() !!} - - - @if($role->users->count() > 0) -
-

{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}

- @include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id']) -
- @endif - -

{{ trans('settings.role_delete_sure') }}

- id}") }}" class="button muted">{{ trans('common.cancel') }} - -
-
- +@stop + +@section('body') +
+

 

+
+

{{ trans('settings.role_delete') }}

+
+

{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}

+ +
id}") }}" method="POST"> + {!! csrf_field() !!} + + + @if($role->users->count() > 0) +
+

{{ trans('settings.role_delete_users_assigned', ['userCount' => $role->users->count()]) }}

+ @include('form/role-select', ['options' => $roles, 'name' => 'migration_role_id']) +
+ @endif + +

{{ trans('settings.role_delete_sure') }}

+
+ id}") }}" class="button outline">{{ trans('common.cancel') }} + +
+
+
+
+ +
@stop diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php index b46b64663..01ba53383 100644 --- a/resources/views/settings/roles/edit.blade.php +++ b/resources/views/settings/roles/edit.blade.php @@ -1,24 +1,17 @@ -@extends('base') - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'roles']) +@stop -
-
-
-

{{ trans('settings.role_edit') }}

-
-
-

- id}") }}" class="button neg float right">{{ trans('settings.role_delete') }} +@section('body') + +
id}") }}" method="POST"> + +
+
+ @include('settings/roles/form', ['model' => $role, 'title' => trans('settings.role_edit'), 'icon' => 'edit'])
- - id}") }}" method="POST"> - - @include('settings/roles/form', ['model' => $role]) -
-
- + @stop diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php index 02ef525ea..b63a99259 100644 --- a/resources/views/settings/roles/form.blade.php +++ b/resources/views/settings/roles/form.blade.php @@ -1,169 +1,175 @@ {!! csrf_field() !!} -
+
+
+

{{$title}}

+
+
+
+
{{ trans('settings.role_details') }}
+
+ + @include('form/text', ['name' => 'display_name']) +
+
+ + @include('form/text', ['name' => 'description']) +
+
{{ trans('settings.role_system') }}
+ + + + + +
-
-
-
-

{{ trans('settings.role_details') }}

-
- - @include('form/text', ['name' => 'display_name']) +
+ +
{{ trans('settings.role_asset') }}
+

{{ trans('settings.role_asset_desc') }}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ trans('common.create') }}{{ trans('common.view') }}{{ trans('common.edit') }}{{ trans('common.delete') }}
{{ trans('entities.books') }} + + + + + + + + + + +
{{ trans('entities.chapters') }} + + + + + + + + + + + +
{{ trans('entities.pages') }} + + + + + + + + + + + +
{{ trans('entities.images') }}@include('settings/roles/checkbox', ['permission' => 'image-create-all']){{ trans('settings.role_controlled_by_asset') }} + + + + + +
{{ trans('entities.attachments') }}@include('settings/roles/checkbox', ['permission' => 'attachment-create-all']){{ trans('settings.role_controlled_by_asset') }} + + + + + +
{{ trans('entities.comments') }}@include('settings/roles/checkbox', ['permission' => 'comment-create-all']){{ trans('settings.role_controlled_by_asset') }} + + + + + +
-
- - @include('form/text', ['name' => 'description']) -
-

{{ trans('settings.role_system') }}

- - - - -
- -
- -

{{ trans('settings.role_asset') }}

-

{{ trans('settings.role_asset_desc') }}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ trans('common.create') }}{{ trans('common.view') }}{{ trans('common.edit') }}{{ trans('common.delete') }}
{{ trans('entities.books') }} - - - - - - - - - - -
{{ trans('entities.chapters') }} - - - - - - - - - - - -
{{ trans('entities.pages') }} - - - - - - - - - - - -
{{ trans('entities.images') }}@include('settings/roles/checkbox', ['permission' => 'image-create-all']){{ trans('settings.role_controlled_by_asset') }} - - - - - -
{{ trans('entities.attachments') }}@include('settings/roles/checkbox', ['permission' => 'attachment-create-all']){{ trans('settings.role_controlled_by_asset') }} - - - - - -
{{ trans('entities.comments') }}@include('settings/roles/checkbox', ['permission' => 'comment-create-all']){{ trans('settings.role_controlled_by_asset') }} - - - - - -
+
+ {{ trans('common.cancel') }} + @if (isset($role) && $role->id) + id}") }}" class="button neg">{{ trans('settings.role_delete') }} + @endif +
- {{ trans('common.cancel') }} -
-
-

{{ trans('settings.role_users') }}

- - @if(isset($role) && count($role->users) > 0) - - @foreach($role->users as $user) - - - + + @endforeach +
{{ $user->name }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - id}") }}"> - @endif - {{ $user->name }} + +
+
+

{{ trans('settings.role_users') }}

+
+ @if(isset($role) && count($role->users) > 0) + + @foreach($role->users as $user) + + + - - @endforeach -
{{ $user->name }} @if(userCan('users-manage') || $currentUser->id == $user->id) - - @endif -
- @else -

- {{ trans('settings.role_users_none') }} -

- @endif - + id}") }}"> + @endif + {{ $user->name }} + @if(userCan('users-manage') || $currentUser->id == $user->id) + + @endif +
+ @else +

+ {{ trans('settings.role_users_none') }} +

+ @endif +
- - -
\ No newline at end of file diff --git a/resources/views/settings/roles/index.blade.php b/resources/views/settings/roles/index.blade.php index c24254946..6cde24539 100644 --- a/resources/views/settings/roles/index.blade.php +++ b/resources/views/settings/roles/index.blade.php @@ -1,35 +1,36 @@ -@extends('base') - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'roles']) +@stop + +@section('body')
+

 

+
+

{{ trans('settings.role_user_roles') }}

+
+ + + + + + + @foreach($roles as $role) + + + + + + @endforeach +
{{ trans('settings.role_name') }}{{ trans('settings.users') }}
id}") }}">{{ $role->display_name }}{{ $role->description }}{{ $role->users->count() }}
-
-
-

{{ trans('settings.role_user_roles') }}

-
-
-

- {{ trans('settings.role_create') }} +
+ {{ trans('settings.role_create') }} +
- - - - - - - - @foreach($roles as $role) - - - - - - @endforeach -
{{ trans('settings.role_name') }}{{ trans('settings.users') }}
id}") }}">{{ $role->display_name }}{{ $role->description }}{{ $role->users->count() }}
@stop diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index e0019e618..90ceac9b8 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -1,31 +1,26 @@ -@extends('base') +@extends('simple-layout') +@section('toolbar') + @include('settings/navbar', ['selected' => 'users']) +@stop -@section('content') +@section('body') -
-
-
-
-
- {{ trans('settings.users') }} +
+

 

+
+

{{ trans('settings.users_add_new') }}

+
+
+ {!! csrf_field() !!} + @include('users/forms/' . $authMethod) +
+ {{ trans('common.cancel') }} +
-
+
-
-

{{ trans('settings.users_add_new') }}

- -
- {!! csrf_field() !!} - @include('users/forms/' . $authMethod) -
- {{ trans('common.cancel') }} - -
-
-
- @stop diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php index 135231a32..a7d4e2476 100644 --- a/resources/views/users/delete.blade.php +++ b/resources/views/users/delete.blade.php @@ -1,32 +1,27 @@ -@extends('base') +@extends('simple-layout') -@section('content') +@section('toolbar') + @include('settings/navbar', ['selected' => 'users']) +@stop -
-
-
-
-
- Users - » - id}") }}" class="text-button">{{ $user->name }} -
-
+@section('body') + +
+

 

+
+

{{ trans('settings.users_delete') }}

+
+

{{ trans('settings.users_delete_warning', ['userName' => $user->name]) }}

+

{{ trans('settings.users_delete_confirm') }}

+ +
id}") }}" method="POST"> + {!! csrf_field() !!} + + id}") }}" class="button outline">{{ trans('common.cancel') }} + +
-
-

{{ trans('settings.users_delete') }}

-

{{ trans('settings.users_delete_warning', ['userName' => $user->name]) }}

-

{{ trans('settings.users_delete_confirm') }}

- -
id}") }}" method="POST"> - {!! csrf_field() !!} - - id}") }}" class="button muted">{{ trans('common.cancel') }} - -
-
- @stop diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index ff3475194..f860d12fd 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -1,80 +1,84 @@ -@extends('base') - - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'users']) +@stop + +@section('body')
-
id}") }}" method="post"> -
-
-

{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

-
-
-

- @if($authMethod !== 'system') - id}/delete") }}" class="neg button float right">{{ trans('settings.users_delete') }} - @endif -
-
-
-
- {!! csrf_field() !!} - - @include('users.forms.' . $authMethod, ['model' => $user]) +

 

+
+

{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

+
+ id}") }}" method="post"> +
+
+ {!! csrf_field() !!} + + @include('users.forms.' . $authMethod, ['model' => $user]) -
-
-
- -

{{ trans('settings.users_avatar_desc') }}

+
+
+
+ +

{{ trans('settings.users_avatar_desc') }}

- @include('components.image-picker', [ - 'resizeHeight' => '512', - 'resizeWidth' => '512', - 'showRemove' => false, - 'defaultImage' => baseUrl('/user_avatar.png'), - 'currentImage' => $user->getAvatar(80), - 'currentId' => $user->image_id, - 'name' => 'image_id', - 'imageClass' => 'avatar large' - ]) -
-
- - -
-
-
-
- {{ trans('common.cancel') }} - -
- - -
- - @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) -

{{ trans('settings.users_social_accounts') }}

-

{{ trans('settings.users_social_accounts_info') }}

-
- @foreach($activeSocialDrivers as $driver => $enabled) -
-
@icon($driver, ['width' => 56])
-
- @if($user->hasSocialAccount($driver)) - {{ trans('settings.users_social_disconnect') }} - @else - {{ trans('settings.users_social_connect') }} - @endif + @include('components.image-picker', [ + 'resizeHeight' => '512', + 'resizeWidth' => '512', + 'showRemove' => false, + 'defaultImage' => baseUrl('/user_avatar.png'), + 'currentImage' => $user->getAvatar(80), + 'currentId' => $user->image_id, + 'name' => 'image_id', + 'imageClass' => 'avatar large' + ]) +
+
+ + +
- @endforeach +
+ {{ trans('common.cancel') }} + @if($authMethod !== 'system') + id}/delete") }}" class="neg button">{{ trans('settings.users_delete') }} + @endif + +
+ +
+
+ + @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0) +
+

{{ trans('settings.users_social_accounts') }}

+
+

{{ trans('settings.users_social_accounts_info') }}

+
+
+ @foreach($activeSocialDrivers as $driver => $enabled) +
+
@icon($driver, ['width' => 56])
+
+ @if($user->hasSocialAccount($driver)) + {{ trans('settings.users_social_disconnect') }} + @else + {{ trans('settings.users_social_connect') }} + @endif +
+
 
+
+ @endforeach +
+
+
@endif diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 3ea5a03f7..26da56858 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -1,80 +1,77 @@ -@extends('base') - - -@section('content') +@extends('simple-layout') +@section('toolbar') @include('settings/navbar', ['selected' => 'users']) +@stop - +@section('body')
-
-
-

{{ trans('settings.users') }}

-
-
-

- @if(userCan('users-manage')) - {{ trans('settings.users_add_new') }} - @endif -
-
+

 

+
+

{{ trans('settings.users') }}

+
+
+
+
+
+ @foreach(collect($listDetails)->except('search') as $name => $val) + + @endforeach + +
+
+
+ @if(userCan('users-manage')) + {{ trans('settings.users_add_new') }} + @endif +
+
+
-
-
-
+ + + + + + + + @foreach($users as $user) + + + + + + + @endforeach +
{{ trans('auth.name') }}{{ trans('auth.email') }}{{ trans('settings.role_user_roles') }}
{{ $user->name }} + @if(userCan('users-manage') || $currentUser->id == $user->id) + id}") }}"> + @endif + {{ $user->name }} + @if(userCan('users-manage') || $currentUser->id == $user->id) + + @endif + + @if(userCan('users-manage') || $currentUser->id == $user->id) + id}") }}"> + @endif + {{ $user->email }} + @if(userCan('users-manage') || $currentUser->id == $user->id) + + @endif + + @foreach($user->roles as $index => $role) + id}") }}">{{$role->display_name}}@if($index !== count($user->roles) -1),@endif + @endforeach +
+ +
{{ $users->links() }}
-
-
-
- @foreach(collect($listDetails)->except('search') as $name => $val) - - @endforeach - -
+
- - - - - - - - @foreach($users as $user) - - - - - - - @endforeach -
{{ trans('auth.name') }}{{ trans('auth.email') }}{{ trans('settings.role_user_roles') }}
{{ $user->name }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - id}") }}"> - @endif - {{ $user->name }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - - @endif - - @if(userCan('users-manage') || $currentUser->id == $user->id) - id}") }}"> - @endif - {{ $user->email }} - @if(userCan('users-manage') || $currentUser->id == $user->id) - - @endif - - @foreach($user->roles as $index => $role) - id}") }}">{{$role->display_name}}@if($index !== count($user->roles) -1),@endif - @endforeach -
- -
- {{ $users->links() }} -
@stop diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index 10bd0ec63..d762f0f24 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -1,76 +1,81 @@ -@extends('base') +@extends('sidebar-layout') -@section('content') +@section('toolbar') +
+
+ {{ $user->name }} +
+
+@stop + +@section('sidebar') +
+

{{ trans('entities.recent_activity') }}

+ @include('partials/activity-list', ['activity' => $activity]) +
+@stop + +@section('body') + +
+ +
-
-
- -
- -
-
-
-
- {{ $user->name }} -
-
-

{{ $user->name }}

-

- {{ trans('entities.profile_user_for_x', ['time' => $user->created_at->diffForHumans(null, true)]) }} -

-
-
+
+
+
+ {{ $user->name }}
-
-
{{ trans('entities.profile_created_content') }}
-
- {{ $assetCounts['books'] }} {{ str_plural(trans('entities.book'), $assetCounts['books']) }} -
-
- {{ $assetCounts['chapters'] }} {{ str_plural(trans('entities.chapter'), $assetCounts['chapters']) }} -
-
- {{ $assetCounts['pages'] }} {{ str_plural(trans('entities.page'), $assetCounts['pages']) }} -
+
+

{{ $user->name }}

+

+ {{ trans('entities.profile_user_for_x', ['time' => $user->created_at->diffForHumans(null, true)]) }} +

- - -
- -

{{ trans('entities.recently_created_pages') }}

- @if (count($recentlyCreated['pages']) > 0) - @include('partials/entity-list', ['entities' => $recentlyCreated['pages']]) - @else -

{{ trans('entities.profile_not_created_pages', ['userName' => $user->name]) }}

- @endif - -
- -

{{ trans('entities.recently_created_chapters') }}

- @if (count($recentlyCreated['chapters']) > 0) - @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']]) - @else -

{{ trans('entities.profile_not_created_chapters', ['userName' => $user->name]) }}

- @endif - -
- -

{{ trans('entities.recently_created_books') }}

- @if (count($recentlyCreated['books']) > 0) - @include('partials/entity-list', ['entities' => $recentlyCreated['books']]) - @else -

{{ trans('entities.profile_not_created_books', ['userName' => $user->name]) }}

- @endif
- -
-

{{ trans('entities.recent_activity') }}

- @include('partials/activity-list', ['activity' => $activity]) +
+
{{ trans('entities.profile_created_content') }}
+
+ {{ $assetCounts['books'] }} {{ str_plural(trans('entities.book'), $assetCounts['books']) }} +
+
+ {{ $assetCounts['chapters'] }} {{ str_plural(trans('entities.chapter'), $assetCounts['chapters']) }} +
+
+ {{ $assetCounts['pages'] }} {{ str_plural(trans('entities.page'), $assetCounts['pages']) }} +
-
+ + +
+ +

{{ trans('entities.recently_created_pages') }}

+ @if (count($recentlyCreated['pages']) > 0) + @include('partials/entity-list', ['entities' => $recentlyCreated['pages']]) + @else +

{{ trans('entities.profile_not_created_pages', ['userName' => $user->name]) }}

+ @endif + +
+ +

{{ trans('entities.recently_created_chapters') }}

+ @if (count($recentlyCreated['chapters']) > 0) + @include('partials/entity-list', ['entities' => $recentlyCreated['chapters']]) + @else +

{{ trans('entities.profile_not_created_chapters', ['userName' => $user->name]) }}

+ @endif + +
+ +

{{ trans('entities.recently_created_books') }}

+ @if (count($recentlyCreated['books']) > 0) + @include('partials/entity-list', ['entities' => $recentlyCreated['books']]) + @else +

{{ trans('entities.profile_not_created_books', ['userName' => $user->name]) }}

+ @endif