diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 06ed0cd66d..7ff7d61e53 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -24,7 +24,7 @@ Asset Categories :: @lang('admin/categories/table.title') - @lang('table.actions') + @lang('table.actions') @@ -57,4 +57,4 @@ Asset Categories :: -@stop \ No newline at end of file +@stop diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 3185270831..06652810a6 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -25,7 +25,7 @@ Asset Depreciations :: @lang('admin/depreciations/table.title') @lang('admin/depreciations/table.term') - @lang('table.actions') + @lang('table.actions') @@ -57,4 +57,4 @@ Asset Depreciations :: -@stop \ No newline at end of file +@stop diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 555a67fdd5..302b9ceb37 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -26,7 +26,7 @@ Group Management :: @lang('admin/groups/table.name') @lang('admin/groups/table.users') @lang('admin/groups/table.created_at') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index b18733d232..19c8117d2d 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -65,7 +65,7 @@ Assets :: @endif @lang('admin/hardware/table.change') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 14650c6229..0a1d69589b 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -294,7 +294,8 @@ $('#example').dataTable({ "sPaginationType": "full_numbers", "iDisplayLength": {{ Setting::getSettings()->per_page }}, - "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]] + "aLengthMenu": [[{{ Setting::getSettings()->per_page }}, -1], [{{ Setting::getSettings()->per_page }}, "All"]], + "aoColumnDefs": [{ 'bSortable': false, 'aTargets': [ 'actions' ] }] }); }); diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index 2a32b2d35b..614f344400 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -24,7 +24,7 @@ Licenses :: @lang('admin/licenses/table.title') @lang('admin/licenses/table.serial') @lang('admin/licenses/table.assigned_to') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index abc1acc33b..f137409675 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -26,7 +26,7 @@ Locations :: @lang('admin/locations/table.city'), @lang('admin/locations/table.state') @lang('admin/locations/table.country') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 72bf06aebe..6faff25609 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -25,7 +25,7 @@ Asset Manufacturers :: @lang('admin/manufacturers/table.title') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index e4f492518e..0a1f283265 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -25,7 +25,7 @@ Asset Models :: @lang('admin/models/table.numassets') Depreciation Category - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php index 0aee7bbd4d..cad5aab766 100755 --- a/app/views/backend/statuslabels/index.blade.php +++ b/app/views/backend/statuslabels/index.blade.php @@ -28,7 +28,7 @@ Status Labels @lang('admin/statuslabels/table.name') - @lang('table.actions') + @lang('table.actions') diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php index d50f197054..a0d1d4f928 100755 --- a/app/views/backend/users/index.blade.php +++ b/app/views/backend/users/index.blade.php @@ -41,7 +41,7 @@ User Management :: Assets Licenses @lang('admin/users/table.activated') - @lang('table.actions') + @lang('table.actions') diff --git a/composer.json b/composer.json index 4479cbfcc7..652c89fddf 100755 --- a/composer.json +++ b/composer.json @@ -9,9 +9,8 @@ "chumper/datatable": "dev-master" }, "require-dev": { - "phpunit/phpunit": "*" - }, - + "phpunit/phpunit": "*" + }, "autoload": { "classmap": [ "app/commands", @@ -27,11 +26,11 @@ "php artisan clear-compiled" ], "post-update-cmd": [ - "php artisan optimize" - "php artisan debugbar:publish" + "php artisan optimize", + "php artisan debugbar:publish" ], "post-install-cmd": [ - "php artisan debugbar:publish" + "php artisan debugbar:publish" ], "post-create-project-cmd": [ "php artisan key:generate" diff --git a/public/assets/css/lib/jquery.dataTables.css b/public/assets/css/lib/jquery.dataTables.css index 3b754be42e..b0e842b7d4 100644 --- a/public/assets/css/lib/jquery.dataTables.css +++ b/public/assets/css/lib/jquery.dataTables.css @@ -13,8 +13,7 @@ table.dataTable thead th { padding: 10px 18px 15px 18px; border-top: 1px solid #dee3ea; font-weight: 600; - cursor: pointer; - *cursor: hand; + } table.dataTable tfoot th { @@ -228,13 +227,13 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; } /* * Sorting */ -.sorting { background: url('../../img/datatables/sort_both.png') no-repeat center right; } -.sorting_asc { background: url('../../img/datatables/sort_asc.png') no-repeat center right; } -.sorting_desc { background: url('../../img/datatables/sort_desc.png') no-repeat center right; } +.sorting { background: url('../../img/datatables/sort_both.png') no-repeat center right; cursor: pointer; *cursor: hand; } +.sorting_asc { background: url('../../img/datatables/sort_asc.png') no-repeat center right; cursor: pointer; *cursor: hand;} +.sorting_desc { background: url('../../img/datatables/sort_desc.png') no-repeat center right; cursor: pointer; *cursor: hand;} .sorting_asc_disabled { background: url('../../img/datatables/sort_asc_disabled.png') no-repeat center right; } .sorting_desc_disabled { background: url('../../img/datatables/sort_desc_disabled.png') no-repeat center right; } - + table.dataTable thead th:active, table.dataTable thead td:active { outline: none;