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

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-contrast.css
#	public/css/dist/skins/skin-contrast.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2021-05-04 22:03:56 -07:00
parent 62f091e769 57b9b571dc
commit 5760b76c4e
16 changed files with 88 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/assets/less/skins/skin-black-dark.less
View file

@ -403,3 +403,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-black.less
View file

@ -108,4 +108,8 @@ a {
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: @black;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-blue-dark.less
View file

@ -392,3 +392,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-blue.less
View file

@ -120,4 +120,8 @@ a {
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #3c8dbc;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-contrast.less
View file

@ -168,4 +168,8 @@ input::-ms-input-placeholder { /* IE 10+ */
.fixed-table-container tbody .selected td {
background-color: #fff8af;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-green-dark.less
View file

@ -392,3 +392,7 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-green.less
View file

@ -105,4 +105,8 @@ a {
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: @green;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-orange-dark.less
View file

@ -394,3 +394,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-orange.less
View file

@ -105,4 +105,8 @@ a {
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: @orange;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-purple-dark.less
View file

@ -394,3 +394,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-purple.less
View file

@ -108,3 +108,6 @@ a {
background-color: @purple;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-red-dark.less
View file

@ -393,3 +393,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-red.less
View file

@ -105,4 +105,8 @@ a {
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: @red;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

3
resources/assets/less/skins/skin-yellow-dark.less
View file

@ -391,3 +391,6 @@ a {
display: table-cell;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

4
resources/assets/less/skins/skin-yellow.less
View file

@ -106,3 +106,7 @@ a {
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: @yellow;
}
.search-highlight, .search-highlight:hover {
background-color: #e9d15b;
}

41
resources/views/partials/bootstrap-table.blade.php
View file

@ -1,13 +1,15 @@
@push('css')
<link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
@endpush
@push('js')
<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
<script nonce="{{ csrf_token() }}">
$(function () {
var stickyHeaderOffsetY = 0;
if ( $('.navbar-fixed-top').css('height') ) {
@ -21,7 +23,7 @@
var keyBlocked = function(key) {
for(var j in blockedFields) {
if(key === blockedFields[j]) {
if (key === blockedFields[j]) {
return true;
}
}
@ -44,6 +46,7 @@
mobileResponsive: true,
maintainSelected: true,
trimOnSearch: false,
showSearchClearButton: true,
paginationFirstText: "{{ trans('general.first') }}",
paginationLastText: "{{ trans('general.last') }}",
paginationPreText: "{{ trans('general.previous') }}",
@ -69,12 +72,14 @@
paginationSwitchUp: 'fa-caret-square-o-up',
columns: 'fa-columns',
refresh: 'fa-refresh',
export: 'fa-download'
export: 'fa-download',
clearSearch: 'fa-times'
},
exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'],
onLoadSuccess: function () {
$('[data-toggle="tooltip"]').tooltip(); // Need to attach tooltips after ajax call
$('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
}
});
});
@ -621,13 +626,37 @@
});
// This is necessary to make the bootstrap tooltips work inside of the
// wenzhixin/bootstrap-table formatters
$(function() {
// This handles the search box highlighting on both ajax and client-side
// bootstrap tables
var searchboxHighlighter = function (event) {
$('.search-input').each(function (index, element) {
if ($(element).val() != '') {
$(element).addClass('search-highlight');
$(element).next().children().addClass('search-highlight');
} else {
$(element).removeClass('search-highlight');
$(element).next().children().removeClass('search-highlight');
}
});
};
$('.search button[name=clearSearch]').click(searchboxHighlighter);
searchboxHighlighter({ name:'pageload'});
$('.search-input').keyup(searchboxHighlighter);
// This is necessary to make the bootstrap tooltips work inside of the
// wenzhixin/bootstrap-table formatters
$('#table').on('post-body.bs.table', function () {
$('[data-toggle="tooltip"]').tooltip({
container: 'body'
});
});
});