X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/038015f852f8ea7f233d95dcb7cdc59f83e22bc2..refs/pull/5312/head:/resources/views/users/index.blade.php

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 953a12900..0dd607f8c 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -9,59 +9,34 @@
 
             <div class="flex-container-row wrap justify-space-between items-center">
                 <h1 class="list-heading">{{ trans('settings.users') }}</h1>
+                <div>
+                    <a href="{{ url("/http/source.bookstackapp.com/settings/users/create") }}" class="outline button my-none">{{ trans('settings.users_add_new') }}</a>
+                </div>
+            </div>
 
+            <p class="text-muted">{{ trans('settings.users_index_desc') }}</p>
+
+            <div class="flex-container-row items-center justify-space-between gap-m mt-m mb-l wrap">
                 <div>
                     <div class="block inline mr-xs">
                         <form method="get" action="{{ url("/http/source.bookstackapp.com/settings/users") }}">
-                            @foreach(collect($listDetails)->except('search') as $name => $val)
-                                <input type="hidden" name="{{ $name }}" value="{{ $val }}">
-                            @endforeach
-                            <input type="text" name="search" placeholder="{{ trans('settings.users_search') }}" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
+                            <input type="text"
+                                   name="search"
+                                   placeholder="{{ trans('settings.users_search') }}"
+                                   value="{{ $listOptions->getSearch() }}">
                         </form>
                     </div>
-                    <a href="{{ url("/http/source.bookstackapp.com/settings/users/create") }}" class="outline button mt-none">{{ trans('settings.users_add_new') }}</a>
+                </div>
+                <div class="justify-flex-end">
+                    @include('common.sort', $listOptions->getSortControlData())
                 </div>
             </div>
 
-            <table class="table">
-                <tr>
-                    <th></th>
-                    <th>
-                        <a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'name']) }}">{{ trans('auth.name') }}</a>
-                        /
-                        <a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'email']) }}">{{ trans('auth.email') }}</a>
-                    </th>
-                    <th>{{ trans('settings.role_user_roles') }}</th>
-                    <th class="text-right">
-                        <a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'last_activity_at']) }}">{{ trans('settings.users_latest_activity') }}</a>
-                    </th>
-                </tr>
+            <div class="item-list">
                 @foreach($users as $user)
-                    <tr>
-                        <td class="text-center" style="line-height: 0;"><img class="avatar med" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}"></td>
-                        <td>
-                            <a href="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}") }}">
-                                {{ $user->name }}
-                                <br>
-                                <span class="text-muted">{{ $user->email }}</span>
-                                @if($user->mfa_values_count > 0)
-                                    <span title="MFA Configured" class="text-pos">@icon('lock')</span>
-                                @endif
-                            </a>
-                        </td>
-                        <td>
-                            @foreach($user->roles as $index => $role)
-                                <small><a href="{{ url("/http/source.bookstackapp.com/settings/roles/{$role->id}") }}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
-                            @endforeach
-                        </td>
-                        <td class="text-right text-muted">
-                            @if($user->last_activity_at)
-                                <small title="{{ $user->last_activity_at->format('Y-m-d H:i:s') }}">{{ $user->last_activity_at->diffForHumans() }}</small>
-                            @endif
-                        </td>
-                    </tr>
+                    @include('users.parts.users-list-item', ['user' => $user])
                 @endforeach
-            </table>
+            </div>
 
             <div>
                 {{ $users->links() }}