diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index bd6bd85d1..4c387f73e 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -54,12 +54,29 @@
@section('inputFields')
-
+
{{ trans('admin/models/table.edit') }}
diff --git a/resources/views/notifications/markdown/report-expected-checkins.blade.php b/resources/views/notifications/markdown/report-expected-checkins.blade.php
index 08b81350e..df4a196af 100644
--- a/resources/views/notifications/markdown/report-expected-checkins.blade.php
+++ b/resources/views/notifications/markdown/report-expected-checkins.blade.php
@@ -10,7 +10,7 @@
@php
$checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
@endphp
-| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assignedTo->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) }}) | {{ $checkin['formatted'] }}
+| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset) }}) | [{{ $asset->assignedTo->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) }}) | {{ $checkin['formatted'] }}
@endforeach
@endcomponent
diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index 992fb52bb..dec9b0f29 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,10 +1,12 @@
-{{ Form::open([
- 'method' => 'POST',
- 'route' => ['hardware/bulkedit'],
- 'class' => 'form-inline',
- 'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm',
- ]) }}
+
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 099640f0b..8fd4891e1 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -29,7 +29,16 @@
data_export_options = $(this).attr('data-export-options');
export_options = data_export_options ? JSON.parse(data_export_options) : {};
export_options['htmlContent'] = false; // this is already the default; but let's be explicit about it
- export_options['jspdf']= {"orientation": "l"};
+ export_options['jspdf'] = {
+ "orientation": "l",
+ "autotable": {
+ "styles": {
+ overflow: 'linebreak'
+ },
+ tableWidth: 'wrap'
+ }
+ };
+ // tableWidth: 'wrap',
// the following callback method is necessary to prevent XSS vulnerabilities
// (this is taken from Bootstrap Tables's default wrapper around jQuery Table Export)
export_options['onCellHtmlData'] = function (cell, rowIndex, colIndex, htmlData) {
@@ -39,66 +48,93 @@
return htmlData
}
$(this).bootstrapTable({
- classes: 'table table-responsive table-no-bordered',
- ajaxOptions: {
- headers: {
- 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
- }
- },
- // reorderableColumns: true,
- stickyHeader: true,
- stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
- stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
- undefinedText: '',
- iconsPrefix: 'fa',
- cookieStorage: '{{ config('session.bs_table_storage') }}',
- cookie: true,
- cookieExpire: '2y',
- showColumnsToggleAll: true,
- minimumCountColumns: 2,
- mobileResponsive: true,
- maintainSelected: true,
- trimOnSearch: false,
- showSearchClearButton: true,
- addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
- paginationFirstText: "{{ trans('general.first') }}",
- paginationLastText: "{{ trans('general.last') }}",
- paginationPreText: "{{ trans('general.previous') }}",
- paginationNextText: "{{ trans('general.next') }}",
- pageList: ['10','20', '30','50','100','150','200'{!! ((config('app.max_results') > 200) ? ",'500'" : '') !!}{!! ((config('app.max_results') > 500) ? ",'".config('app.max_results')."'" : '') !!}],
- pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
- paginationVAlign: 'both',
- queryParams: function (params) {
- var newParams = {};
- for(var i in params) {
- if(!keyBlocked(i)) { // only send the field if it's not in blockedFields
- newParams[i] = params[i];
+ classes: 'table table-responsive table-no-bordered',
+ ajaxOptions: {
+ headers: {
+ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
+ },
+ // reorderableColumns: true,
+ stickyHeader: true,
+ stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
+ stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
+ undefinedText: '',
+ iconsPrefix: 'fa',
+ cookieStorage: '{{ config('session.bs_table_storage') }}',
+ cookie: true,
+ cookieExpire: '2y',
+ showColumnsToggleAll: true,
+ minimumCountColumns: 2,
+ mobileResponsive: true,
+ maintainSelected: true,
+ trimOnSearch: false,
+ showSearchClearButton: true,
+ addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
+ paginationFirstText: "{{ trans('general.first') }}",
+ paginationLastText: "{{ trans('general.last') }}",
+ paginationPreText: "{{ trans('general.previous') }}",
+ paginationNextText: "{{ trans('general.next') }}",
+ pageList: ['10', '20', '30', '50', '100', '150', '200'{!! ((config('app.max_results') > 200) ? ",'500'" : '') !!}{!! ((config('app.max_results') > 500) ? ",'".config('app.max_results')."'" : '') !!}],
+ pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
+ paginationVAlign: 'both',
+ queryParams: function (params) {
+ var newParams = {};
+ for (var i in params) {
+ if (!keyBlocked(i)) { // only send the field if it's not in blockedFields
+ newParams[i] = params[i];
+ }
+ }
+ return newParams;
+ },
+ formatLoadingMessage: function () {
+ return '
{{ trans('general.loading') }}
';
+ },
+ icons: {
+ advancedSearchIcon: 'fas fa-search-plus',
+ paginationSwitchDown: 'fa-caret-square-o-down',
+ paginationSwitchUp: 'fa-caret-square-o-up',
+ fullscreen: 'fa-expand',
+ columns: 'fa-columns',
+ refresh: 'fas fa-sync-alt',
+ export: 'fa-download',
+ clearSearch: 'fa-times'
+ },
+ locale: '{{ app()->getLocale() }}',
+ exportOptions: export_options,
+ exportTypes: ['xlsx', 'excel', 'csv', 'pdf', 'json', 'xml', 'txt', 'sql', 'doc'],
+ onLoadSuccess: function () { // possible 'fixme'? this might be for contents, not for headers?
+ $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
+ },
+ onPostHeader: function () {
+ var lookup = {};
+ var lookup_initialized = false;
+ var ths = $('th');
+ ths.each(function (index, element) {
+ th = $(element);
+ //only populate the lookup table once; don't need to keep doing it.
+ if (!lookup_initialized) {
+ // th -> tr -> thead -> table
+ var table = th.parent().parent().parent()
+ var column_data = table.data('columns')
+ for (var column in column_data) {
+ lookup[column_data[column].field] = column_data[column].titleTooltip;
+ }
+ lookup_initialized = true
+ }
+
+ field = th.data('field'); // find fieldname this column refers to
+ title = lookup[field];
+ if (title) {
+ th.attr('data-toggle', 'tooltip');
+ th.attr('data-placement', 'top');
+ // th.attr('title', title) //this causes 'double-titles' which looks gross
+ th.tooltip({container: 'body', title: title});
+ }
+ })
+ },
+ formatNoMatches: function () {
+ return '{{ trans('table.no_matching_records') }}';
}
- return newParams;
- },
- formatLoadingMessage: function () {
- return '
{{ trans('general.loading') }}
';
- },
- icons: {
- advancedSearchIcon: 'fas fa-search-plus',
- paginationSwitchDown: 'fa-caret-square-o-down',
- paginationSwitchUp: 'fa-caret-square-o-up',
- fullscreen: 'fa-expand',
- columns: 'fa-columns',
- refresh: 'fas fa-sync-alt',
- export: 'fa-download',
- clearSearch: 'fa-times'
- },
- locale: '{{ app()->getLocale() }}',
- exportOptions: export_options,
- exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
- onLoadSuccess: function () {
- $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
- },
- formatNoMatches: function () {
- return '{{ trans('table.no_matching_records') }}';
- }
});
@@ -290,9 +326,6 @@
var dest = 'admin/groups';
}
- if (dest =='maintenances') {
- var dest = 'hardware/maintenances';
- }
if(element_name != '') {
dest = dest + '/' + row.owner_id + '/' + element_name;
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index 22c39da6a..12214b956 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,7 +1,7 @@
@@ -9,7 +9,7 @@
@@ -17,7 +17,7 @@
@@ -25,7 +25,7 @@
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 6bc77aaee..8032cf85f 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -4,7 +4,7 @@
