Fixed comment count update error

[bookstack] / resources / views / users / index.blade.php

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 105fddb5ba55d232cd69fd684006dd6070dab0ae..953a12900a075022d801263b2e0afebaf2334368 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,83 +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>
-        <div class="row action-header">
-            <div class="col-sm-8">
-                <h1>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>Add new user</a>
-                @endif
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-8">
-                <div class="compact">
-                    {{ $users->links() }}
+                <div>
+                    <div class="block inline mr-xs">
+                        <form method="get" action="{{ url("/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("/settings/users/create") }}" class="outline button mt-none">{{ trans('settings.users_add_new') }}</a>
                 </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="Search Users" @if($listDetails['search']) value="{{$listDetails['search']}}" @endif>
-                </form>
-            </div>
-        </div>
-        <div class="text-center">
-
-        </div>
 
-        <table class="table">
-            <tr>
-                <th></th>
-                <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'name']) }}">Name</a></th>
-                <th><a href="{{ sortUrl('/settings/users', $listDetails, ['sort' => 'email']) }}">Email</a></th>
-                <th>User Roles</th>
-            </tr>
-            @foreach($users as $user)
+            <table class="table">
                 <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
+                    <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("/settings/users/{$user->id}") }}">
                                 {{ $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}") }}">
+                                <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(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>
+                        </td>
+                        <td>
+                            @foreach($user->roles as $index => $role)
+                                <small><a href="{{ url("/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>
-            {{ $users->links() }}
-        </div>
     </div>
 
 @stop