shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source 
# Conflicts:
#	resources/views/partials/admin/pagination.blade.php
This commit is contained in:
Cüneyt Şentürk
2019-12-16 17:23:41 +03:00
parent c33a72d92b 1562c69675
commit 112d21c40e
105 changed files with 417 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/partials/admin/pagination.blade.php
View File

@ -1,11 +1,16 @@
@stack('pagination_start')
@if ($items->firstItem())
<div class="col-6">
<span class="table-text hidden-lg">
<div class="col-6 d-flex align-items-center">
<span class="table-text d-none d-lg-block mr-2">
{{ trans('general.show') }}
</span>
<<<<<<< .mine
{!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search hidden-md', '@change' => 'onChangePaginationLimit($event)']) !!}
<span class="table-text hidden-lg">
=======
{!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search d-none d-md-block', 'onchange' => 'this.form.submit()']) !!}
<span class="table-text d-none d-lg-block ml-2">
>>>>>>> .theirs
{{ trans('pagination.page') }}
{{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower((isset($title)) ? $title : trans_choice('general.' . $type, 2))]) }}
</span>