added missing comma that caused the testprocess to fail.

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

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 730ead8aacea6edf70b7ac517e1f9ca608eb8b43..da373c1618b563fddcc9768644b7d1ac608e29cf 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,47 +1,69 @@
-@extends('base')
+@extends('simple-layout')

 
 

+@section('body')
+    <div class="container small">

 
 

-@section('content')
+        <div class="py-m">
+            @include('settings.navbar', ['selected' => 'users'])
+        </div>

 
 

+        <main class="card content-wrap">

 
 

-    <div class="row faded-small">
-        <div class="col-md-6"></div>
-        <div class="col-md-6 faded">
-            <div class="action-buttons">
-                @if($currentUser->can('user-create'))
-                    <a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>New User</a>
-                @endif
-            </div>
-        </div>
-    </div>
+            <div class="grid right-focus v-center">
+                <h1 class="list-heading">{{ trans('settings.users') }}</h1>

 
 

+                <div class="text-right">
+                    <div class="block inline mr-s">
+                        <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>
+                    @if(userCan('users-manage'))
+                        <a href="{{ url("/settings/users/create") }}" style="margin-top: 0;" class="outline button">{{ trans('settings.users_add_new') }}</a>
+                    @endif
+                </div>
+            </div>

 
 

-    <div class="page-content">
-        <h1>Users</h1>
-        <table class="table">
-            <tr>
-                <th></th>
-                <th>Name</th>
-                <th>Email</th>
-                <th>User Type</th>
-            </tr>
-            @foreach($users as $user)
+            {{--TODO - Add last login--}}
+            <table class="table">

                 <tr>
                 <tr>

-                    <td style="line-height: 0;"><img class="avatar" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
-                    <td>
-                        @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
-                        @endif
-                                {{$user->name}}
-                        @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            </a>
-                        @endif
-                    </td>
-                    <td>{{$user->email}}</td>
-                    <td>{{ $user->role->display_name }}</td>
+                    <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>

                 </tr>
                 </tr>

-            @endforeach
-        </table>
+                @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>
+                            @if(userCan('users-manage') || $currentUser->id == $user->id)
+                                <a href="{{ url("/settings/users/{$user->id}") }}">
+                                    @endif
+                                    {{ $user->name }} <br> <span class="text-muted">{{ $user->email }}</span>
+                                    @if(userCan('users-manage') || $currentUser->id == $user->id)
+                                </a>
+                            @endif
+                        </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>
+                    </tr>
+                @endforeach
+            </table>
+
+            <div>
+                {{ $users->links() }}
+            </div>
+        </main>
+

     </div>
 
 @stop
     </div>
 
 @stop