From 8a4a4264cdb3dde4c8276b2b85a7a325a3d2f3d1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 Jan 2017 04:12:13 -0800 Subject: [PATCH] Formatters for bootstyra-tables users listing We should probably abstract these out, since we use similar or the same fields imn other places --- .../views/partials/bootstrap-table.blade.php | 1 + resources/views/users/index.blade.php | 117 +++++++++++++----- 2 files changed, 89 insertions(+), 29 deletions(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 6dbde71a08..2b7c84711a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -11,6 +11,7 @@ $('.snipe-table').bootstrapTable({ undefinedText: '', iconsPrefix: 'fa', showRefresh: true, + //selectItemName: 'bulk_ids[]', @if (isset($search)) search: true, @endif diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 5557f7206a..a85b2050c3 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -60,6 +60,7 @@ data-toolbar="#toolbar" class="table table-striped snipe-table" id="table" + data-maintain-selected="true" data-toggle="table" data-url="{{ route('api.users.index', array(''=>e(Input::get('status')))) }}" data-cookie="true" @@ -67,23 +68,21 @@ data-cookie-id-table="userTableDisplay-{{ config('version.hash_version') }}"> - - @if (Input::get('status')!='deleted') -
- @endif - + @if (Input::get('status')!='deleted') + + @endif {{ trans('general.id') }} {{ trans('admin/companies/table.title') }} {{ trans('admin/users/table.employee_num') }} - {{ trans('admin/users/table.name') }} + {{ trans('admin/users/table.name') }} {{ trans('admin/users/table.title') }} - + {{ trans('admin/users/table.username') }} {{ trans('admin/users/table.manager') }} - {{ trans('admin/users/table.location') }} + {{ trans('admin/users/table.location') }} @@ -102,15 +101,17 @@ {{ trans('general.groups') }} {{ trans('general.notes') }} - {{ trans('admin/users/general.two_factor_enrolled') }} - {{ trans('admin/users/general.two_factor_active') }} + {{ trans('admin/users/general.two_factor_enrolled') }} + {{ trans('admin/users/general.two_factor_active') }} - {{ trans('general.activated') }} - {{ trans('general.created_at') }} - {{ trans('table.actions') }} + {{ trans('general.activated') }} + {{ trans('general.created_at') }} + {{ trans('table.actions') }} +
+
{{ Form::close() }} @@ -123,29 +124,87 @@ @include ('partials.bootstrap-table', ['exportFile' => 'users-export', 'search' => true])