X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0775cd09a152c6e05c100139812f1fc35cb1ac6a..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 3ea5a03f7..0dd607f8c 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,80 +1,48 @@
-@extends('base')
+@extends('layouts.simple')
 
+@section('body')
+    <div class="container small">
 
-@section('content')
+        @include('settings.parts.navbar', ['selected' => 'users'])
 
-    @include('settings/navbar', ['selected' => 'users'])
+        <main class="card content-wrap">
 
-
-    <div class="container small" ng-non-bindable>
-        <div class="row action-header">
-            <div class="col-sm-8">
-                <h1>{{ trans('settings.users') }}</h1>
-            </div>
-            <div class="col-sm-4">
-                <p></p>
-                @if(userCan('users-manage'))
-                    <a href="{{ baseUrl("/settings/users/create") }}" class="pos button float right"><i class="zmdi zmdi-account-add"></i>{{ trans('settings.users_add_new') }}</a>
-                @endif
+            <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>
-        </div>
 
-        <div class="row">
-            <div class="col-sm-8">
-                <div class="compact">
-                    {{ $users->links() }}
+            <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") }}">
+                            <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="col-sm-4">
-                <form method="get" class="float right" 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 class="item-list">
+                @foreach($users as $user)
+                    @include('users.parts.users-list-item', ['user' => $user])
+                @endforeach
             </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>
+            <div>
+                {{ $users->links() }}
+            </div>
+        </main>
 
-        <div>
-            {{ $users->links() }}
-        </div>
     </div>
 
 @stop