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

2
resources/views/partials/admin/navbar.blade.php
View File

@ -188,7 +188,7 @@
</li>
@endpermission
<li class="nav-item hidden-md">
<li class="nav-item d-none d-md-block">
<a class="nav-link" href="{{ url(trans('header.support_link')) }}" target="_blank" title="{{ trans('general.help') }}" role="button" aria-haspopup="true" aria-expanded="false">
<i class="far fa-life-ring"></i>
</a>

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>

2
resources/views/partials/form/bulk_action_row_group.blade.php
View File

@ -2,7 +2,7 @@
<div class="align-items-center d-none" v-if="bulk_action.show" v-bind:class="[bulk_action.show ? 'show' : '']">
<div class="mr-6">
<span class="hidden-sm text-white">
<span class="text-white d-none d-sm-block">
<b v-text="bulk_action.count"></b>
<span v-if="bulk_action.count === 1">
{{ strtolower(trans_choice($text, 1)) }}

2
resources/views/partials/modules/reviews.blade.php
View File

@ -37,7 +37,7 @@
@if ($review_first_item)
<div class="row d-none">
<div class="col-md-6">
<span class="table-text hidden-lg">
<span class="table-text d-none d-lg-block">
{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
</span>
</div>

2
resources/views/partials/portal/navbar.blade.php
View File

@ -80,7 +80,7 @@
</li>
@endpermission
<li class="nav-item hidden-md">
<li class="nav-item d-none d-md-block">
<a class="nav-link" href="{{ url(trans('header.support_link')) }}" target="_blank" title="{{ trans('general.help') }}" role="button" aria-haspopup="true" aria-expanded="false">
<i class="far fa-life-ring"></i>
</a>

6
resources/views/partials/portal/pagination.blade.php
View File

@ -1,11 +1,11 @@
@stack('pagination_start')
@if ($items->firstItem())
<div class="col-6">
<span class="table-text hidden-lg">
<span class="table-text d-none d-lg-block">
{{ trans('general.show') }}
</span>
{!! Form::select('limit', $limits, request('limit', setting('default.list_limit', '25')), ['class' => 'form-control form-control-sm table-header-search hidden-md', 'onchange' => 'this.form.submit()']) !!}
<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">
{{ 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>

46
resources/views/partials/portal/payment_method/redirect/show.blade.php
View File

@ -1,28 +1,26 @@
<div>
<div class="hidden">
@if (!empty($setting['name']))
<h2>{{ $setting['name'] }}</h2>
@endif
<div class="d-none">
@if (!empty($setting['name']))
<h2>{{ $setting['name'] }}</h2>
@endif
@if (!empty($setting['description']))
<div class="well well-sm">{{ $setting['description'] }}</div>
@endif
</div>
<br>
@if (!empty($setting['description']))
<div class="well well-sm">{{ $setting['description'] }}</div>
@endif
</div>
<br>
<div class="buttons">
<div class="pull-right">
{!! Form::open([
'url' => $confirm_url,
'id' => 'redirect-form',
'role' => 'form',
'autocomplete' => "off",
'novalidate' => 'true'
]) !!}
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
{{ trans('general.confirm') }}
</button>
{!! Form::close() !!}
</div>
<div class="buttons">
<div class="pull-right">
{!! Form::open([
'url' => $confirm_url,
'id' => 'redirect-form',
'role' => 'form',
'autocomplete' => "off",
'novalidate' => 'true'
]) !!}
<button @click="onRedirectConfirm" type="button" id="button-confirm" class="btn btn-success">
{{ trans('general.confirm') }}
</button>
{!! Form::close() !!}
</div>
</div>

5
resources/views/partials/portal/payment_method/redirect/signed.blade.php
View File

@ -1,5 +1,4 @@
<div>
<div class="hidden">
<div class="d-none">
@if (!empty($setting['name']))
<h2>{{ $setting['name'] }}</h2>
@endif
@ -25,4 +24,4 @@
{!! Form::close() !!}
</div>
</div>
</div>

2
resources/views/partials/widget/head.blade.php
View File

@ -5,7 +5,7 @@
<h4 class="mb-0">@yield('widget-title')</h4>
</div>
<div class="col-8 text-right hidden-sm">
<div class="col-8 text-right d-none d-sm-block">
@yield('button')
<span>