webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Added pagination, sorting & searching to users list

Browse Source 
As requested on #113
This commit is contained in:
Dan Brown
2016-05-22 10:44:31 +01:00
parent 23ab1f0c81
commit be517de7dc
7 changed files with 123 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/assets/sass/_lists.scss
View File

@ -266,6 +266,7 @@ ul.pagination {
display: inline-block;
list-style: none;
margin: $-m 0;
padding-left: 1px;
li {
float: left;
}
@ -300,6 +301,10 @@ ul.pagination {
}
}
.compact ul.pagination {
margin: 0;
}
.entity-list {
>div {
padding: $-m 0;

6
resources/assets/sass/_text.scss
View File

@ -297,6 +297,12 @@ span.sep {
display: block;
}
.action-header {
h1 {
margin-top: $-m;
}
}
/**
* Icons
*/

14
resources/views/settings/roles/index.blade.php
View File

@ -6,11 +6,15 @@
<div class="container small">
<h1>User Roles</h1>
<p>
<a href="/settings/roles/new" class="text-pos"><i class="zmdi zmdi-lock-open"></i>Add new role</a>
</p>
<div class="row action-header">
<div class="col-sm-8">
<h1>User Roles</h1>
</div>
<div class="col-sm-4">
<p></p>
<a href="/settings/roles/new" class="button float right pos"><i class="zmdi zmdi-lock-open"></i>Add new role</a>
</div>
</div>
<table class="table">
<tr>

49
resources/views/users/index.blade.php
View File

@ -7,17 +7,42 @@
<div class="container small" ng-non-bindable>
<h1>Users</h1>
@if(userCan('users-manage'))
<p>
<a href="/settings/users/create" class="text-pos"><i class="zmdi zmdi-account-add"></i>Add new user</a>
</p>
@endif
<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="/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>
<div class="col-sm-4">
<form method="get" class="float right" action="/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>Name</th>
<th>Email</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)
@ -42,11 +67,17 @@
@endif
</td>
<td>
<small> {{ $user->roles->implode('display_name', ', ') }}</small>
@foreach($user->roles as $index => $role)
<small><a href="/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>
</div>
@stop