Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

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

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 49e124e56e53ab7976c566bee6a14a2babded4ca..3ea5a03f7fa377b9582ead6be0fd11b077669170 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -6,37 +6,75 @@
     @include('settings/navbar', ['selected' => 'users'])
 
 
     @include('settings/navbar', ['selected' => 'users'])
 
 

-    <div class="container small">
-        <h1>Users</h1>
-        @if($currentUser->can('user-create'))
-            <p>
-                <a href="/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add New User</a>
-            </p>
-        @endif
+    <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>
+        </div>
+
+        <div class="row">
+            <div class="col-sm-8">
+                <div class="compact">
+                    {{ $users->links() }}
+                </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>
+        </div>
+

         <table class="table">
             <tr>
                 <th></th>
         <table class="table">
             <tr>
                 <th></th>

-                <th>Name</th>
-                <th>Email</th>
-                <th>User Type</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>
             </tr>
             @foreach($users as $user)
                 <tr>

-                    <td style="line-height: 0;"><img class="avatar" src="{{$user->getAvatar(40)}}" alt="{{$user->name}}"></td>
+                    <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>
                     <td>

-                        @if($currentUser->can('user-update') || $currentUser->id == $user->id)
-                            <a href="/users/{{$user->id}}">
+                        @if(userCan('users-manage') || $currentUser->id == $user->id)
+                            <a href="{{ baseUrl("/settings/users/{$user->id}") }}">

                                 @endif
                                 @endif

-                                {{$user->name}}
-                                @if($currentUser->can('user-update') || $currentUser->id == $user->id)
+                                {{ $user->email }}
+                                @if(userCan('users-manage') || $currentUser->id == $user->id)

                             </a>
                         @endif
                     </td>
                             </a>
                         @endif
                     </td>

-                    <td>{{$user->email}}</td>
-                    <td>{{ $user->role->display_name }}</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>
                 </tr>
             @endforeach
         </table>

+
+        <div>
+            {{ $users->links() }}
+        </div>

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