Merge pull request #3652 from rahulcs0082/development

Issue #3649 fixed
This commit is contained in:
Jitendra Singh 2020-08-05 11:27:24 +05:30 committed by GitHub
commit 567e17da9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions

View File

@ -8,22 +8,9 @@
@push('scripts')
<script type="text/x-template" id="datagrid-filters">
<div class="grid-container">
<div class="datagrid-filters" id="datagrid-filters">
<div class="datagrid-filters">
<div class="filter-left">
<div class="search-filter">
<input type="search" id="search-field" class="control"
placeholder="{{ __('ui::app.datagrid.search') }}" v-model="searchValue"
v-on:keyup.enter="searchCollection(searchValue)"/>
<div class="icon-wrapper">
<span class="icon search-icon search-btn"
v-on:click="searchCollection(searchValue)"></span>
</div>
</div>
</div>
<div class="filter-right">
@if (isset($results['extraFilters']['channels']))
<div class="dropdown-filters per-page">
<div class="control-group">
@ -82,7 +69,24 @@
</div>
</div>
@endif
</div>
</div>
<div class="datagrid-filters" id="datagrid-filters">
<div class="filter-left">
<div class="search-filter">
<input type="search" id="search-field" class="control"
placeholder="{{ __('ui::app.datagrid.search') }}" v-model="searchValue"
v-on:keyup.enter="searchCollection(searchValue)"/>
<div class="icon-wrapper">
<span class="icon search-icon search-btn"
v-on:click="searchCollection(searchValue)"></span>
</div>
</div>
</div>
<div class="filter-right">
<div class="dropdown-filters per-page">
<div class="control-group">
<label class="per-page-label" for="perPage">