DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-06-23 20:02:19 -07:00
parent 18c37c97b8 d0081188c7
commit 6c2d06efb9
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/layouts/default.blade.php
View file

@ -744,7 +744,7 @@
<!-- Content Wrapper. Contains page content --> <!-- Content Wrapper. Contains page content -->
<div class="content-wrapper" role="main"> <div class="content-wrapper" role="main" id="setting-list">
@if ($debug_in_production) @if ($debug_in_production)
<div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;"> <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">

44
resources/views/settings/index.blade.php
View file

@ -6,6 +6,32 @@
@parent @parent
@stop @stop
@section('header_right')
<!-- search filter box -->
<div class="pull-right">
<form onsubmit="return false;">
<div class="btn-group">
<input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}">
<span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
<button type="submit" disabled style="display: none" aria-hidden="true"></button>
</div>
<a href="{{ route('settings.index') }}" class="btn btn-primary pull-right" style="margin-left: 10px;">{{ trans('general.back') }}</a>
</form>
</div>
<!--/ search filter box -->
@stop
{{-- Page content --}} {{-- Page content --}}
@section('content') @section('content')
@ -28,20 +54,6 @@
} }
</style> </style>
<div class="row" id="setting-list">
<!-- search filter box -->
<div class="col-md-3 col-md-offset-9 form-group">
<form onsubmit="return false;">
<div class="btn-group">
<input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}">
<span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
<button type="submit" disabled style="display: none" aria-hidden="true"></button>
</div>
</form>
</div>
<!--/ search filter box -->
<!-- search filter list --> <!-- search filter list -->
<div class="list"> <div class="list">
@ -386,11 +398,11 @@
valueNames: [ 'name', 'keywords', 'summary', 'help-block'] valueNames: [ 'name', 'keywords', 'summary', 'help-block']
}; };
var userList = new List('setting-list', options); var settingList = new List('setting-list', options);
$("#searchclear").click(function(){ $("#searchclear").click(function(){
$("#searchinput").val(''); $("#searchinput").val('');
userList.search(); settingList.search();
}); });