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

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6e5d10c5f..953a12900 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,50 +1,73 @@
-@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="flex-container-row wrap justify-space-between items-center">
+                <h1 class="list-heading">{{ trans('settings.users') }}</h1>
 
-    <div class="container small" ng-non-bindable>
-        <h1>Users</h1>
-        @if($currentUser->can('user-create'))
-            <p>
-                <a href="/http/source.bookstackapp.com/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
-            </p>
-        @endif
-        <table class="table">
-            <tr>
-                <th></th>
-                <th>Name</th>
-                <th>Email</th>
-                <th>User Type</th>
-            </tr>
-            @foreach($users as $user)
+                <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>
+                        </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>
+
+            <table class="table">
                 <tr>
-                    <td style="line-height: 0;"><img class="avatar med" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
-                    <td>
-                        @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/http/source.bookstackapp.com/settings/users/{{$user->id}}">
-                                @endif
+                    <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>
+                @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 }}
-                                @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            </a>
-                        @endif
-                    </td>
-                    <td>
-                        @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/http/source.bookstackapp.com/settings/users/{{$user->id}}">
+                                <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
-                                {{ $user->email }}
-                                @if($currentUser->can('user-update') || $currentUser->id == $user->id)
                             </a>
-                        @endif
-                    </td>
-                    <td>{{ $user->role->display_name }}</td>
-                </tr>
-            @endforeach
-        </table>
+                        </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>
+                @endforeach
+            </table>
+
+            <div>
+                {{ $users->links() }}
+            </div>
+        </main>
+
     </div>
 
 @stop