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

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index fd05a7a15..0dd607f8c 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,76 +1,47 @@
-@extends('simple-layout')
-
-@section('toolbar')
-    @include('settings/navbar', ['selected' => 'users'])
-@stop
+@extends('layouts.simple')
 
 @section('body')
     <div class="container small">
-        <p>&nbsp;</p>
-        <div class="card">
-            <h3>@icon('users') {{ trans('settings.users') }}</h3>
-            <div class="body">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-sm-4">
-                            <form method="get" action="{{ baseUrl("/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>
-                            </form>
-                        </div>
-                        <div class="col-sm-8 text-right">
-                            @if(userCan('users-manage'))
-                                <a href="{{ baseUrl("/settings/users/create") }}" style="margin-top: 0;" class="pos button">{{ trans('settings.users_add_new') }}</a>
-                            @endif
-                        </div>
-                    </div>
+
+        @include('settings.parts.navbar', ['selected' => 'users'])
+
+        <main class="card content-wrap">
+
+            <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>
 
-                <table class="table">
-                    <tr>
-                        <th></th>
-                        <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'name']) }}">{{ trans('auth.name') }}</a></th>
-                        <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'email']) }}">{{ trans('auth.email') }}</a></th>
-                        <th>{{ trans('settings.role_user_roles') }}</th>
-                    </tr>
-                    @foreach($users as $user)
-                        <tr>
-                            <td style="line-height: 0;"><img class="avatar med" src="{{ $user->getAvatar(40)}}" alt="{{ $user->name }}"></td>
-                            <td>
-                                @if(userCan('users-manage') || $currentUser->id == $user->id)
-                                    <a href="{{ baseUrl("/settings/users/{$user->id}") }}">
-                                        @endif
-                                        {{ $user->name }}
-                                        @if(userCan('users-manage') || $currentUser->id == $user->id)
-                                    </a>
-                                @endif
-                            </td>
-                            <td>
-                                @if(userCan('users-manage') || $currentUser->id == $user->id)
-                                    <a href="{{ baseUrl("/settings/users/{$user->id}") }}">
-                                        @endif
-                                        {{ $user->email }}
-                                        @if(userCan('users-manage') || $currentUser->id == $user->id)
-                                    </a>
-                                @endif
-                            </td>
-                            <td>
-                                @foreach($user->roles as $index => $role)
-                                    <small><a href="{{ baseUrl("/settings/roles/{$role->id}") }}">{{$role->display_name}}</a>@if($index !== count($user->roles) -1),@endif</small>
-                                @endforeach
-                            </td>
-                        </tr>
-                    @endforeach
-                </table>
+            <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>
-                    {{ $users->links() }}
+                    <div class="block inline mr-xs">
+                        <form method="get" action="{{ url("/http/source.bookstackapp.com/settings/users") }}">
+                            <input type="text"
+                                   name="search"
+                                   placeholder="{{ trans('settings.users_search') }}"
+                                   value="{{ $listOptions->getSearch() }}">
+                        </form>
+                    </div>
+                </div>
+                <div class="justify-flex-end">
+                    @include('common.sort', $listOptions->getSortControlData())
                 </div>
+            </div>
+
+            <div class="item-list">
+                @foreach($users as $user)
+                    @include('users.parts.users-list-item', ['user' => $user])
+                @endforeach
+            </div>
 
+            <div>
+                {{ $users->links() }}
             </div>
-        </div>
+        </main>
 
     </div>