ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

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

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

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

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2022-06-14 17:54:18 -07:00
parent f16a4b6aef
commit 5fe1078013
32 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/less/overrides.less
+3 -1
View File
@@ -596,7 +596,9 @@ th.css-accessory > .th-inner::before
th.css-padlock > .th-inner::before
{
content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400;
padding-right: 2px;
padding-right: 4px;
font-weight: 300;
font-size: 12px;
}
/**
resources/views/accessories/index.blade.php
+1
View File
@@ -30,6 +30,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-show-footer="true"
resources/views/accessories/view.blade.php
+1
View File
@@ -81,6 +81,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/asset_maintenances/index.blade.php
+1
View File
@@ -28,6 +28,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-footer="true"
data-show-export="true"
data-show-refresh="true"
resources/views/categories/index.blade.php
+1
View File
@@ -29,6 +29,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/companies/index.blade.php
+1
View File
@@ -28,6 +28,7 @@
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
id="companiesTable"
class="table table-striped snipe-table"
resources/views/components/index.blade.php
+1
View File
@@ -26,6 +26,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
resources/views/consumables/index.blade.php
+1
View File
@@ -29,6 +29,7 @@
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-fullscreen="true"
data-show-footer="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/departments/index.blade.php
+1
View File
@@ -25,6 +25,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/groups/index.blade.php
+1
View File
@@ -28,6 +28,7 @@
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
data-sort-name="name"
id="groupsTable"
resources/views/hardware/audit-due.blade.php
+1
View File
@@ -38,6 +38,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
resources/views/hardware/audit-overdue.blade.php
+1
View File
@@ -36,6 +36,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
resources/views/hardware/index.blade.php
+1
View File
@@ -84,6 +84,7 @@
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
data-show-fullscreen="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
resources/views/hardware/view.blade.php
+4
View File
@@ -1002,6 +1002,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
@@ -1053,6 +1054,7 @@
data-side-pagination="server"
data-toolbar="#maintenance-toolbar"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-show-export="true"
data-export-options='{
@@ -1079,6 +1081,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
@@ -1126,6 +1129,7 @@
data-side-pagination="client"
data-sortable="true"
data-show-columns="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="desc"
data-sort-name="created_at"
resources/views/kits/index.blade.php
+1
View File
@@ -27,6 +27,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/licenses/index.blade.php
+1
View File
@@ -31,6 +31,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
resources/views/licenses/view.blade.php
+1
View File
@@ -411,6 +411,7 @@
data-search="false"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/locations/index.blade.php
+1
View File
@@ -29,6 +29,7 @@
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/manufacturers/index.blade.php
+1
View File
@@ -40,6 +40,7 @@
data-show-footer="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/manufacturers/view.blade.php
+1 -1
View File
@@ -102,7 +102,7 @@
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
data-search="true"
data-show-footer="true"
data-show-fullscreen="true"
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
resources/views/models/view.blade.php
+1
View File
@@ -56,6 +56,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
data-bulk-form-id="#assetsBulkForm"
resources/views/partials/bootstrap-table.blade.php
+1
View File
@@ -84,6 +84,7 @@
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',
resources/views/statuslabels/index.blade.php
+1
View File
@@ -33,6 +33,7 @@
data-side-pagination="server"
data-show-columns="true"
data-show-export="true"
data-show-fullscreen="true"
data-show-refresh="true"
data-sort-order="asc"
data-sort-name="name"
resources/views/statuslabels/view.blade.php
+1
View File
@@ -22,6 +22,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/suppliers/index.blade.php
+1
View File
@@ -29,6 +29,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/suppliers/view.blade.php
+4
View File
@@ -98,6 +98,7 @@
data-show-columns="true"
data-show-export="true"
data-show-refresh="true"
data-show-fullscreen="true"
data-sort-order="asc"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"
@@ -128,6 +129,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
@@ -155,6 +157,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
@@ -182,6 +185,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/users/index.blade.php
+1
View File
@@ -50,6 +50,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="asc"
resources/views/users/view.blade.php
+6
View File
@@ -586,6 +586,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
@@ -615,6 +616,7 @@
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
@@ -680,6 +682,7 @@
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
@@ -726,6 +729,7 @@
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-show-refresh="true"
@@ -771,6 +775,7 @@
data-pagination="true"
data-side-pagination="client"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-footer="true"
data-toolbar="#upload-toolbar"
@@ -863,6 +868,7 @@
data-search="true"
data-side-pagination="server"
data-show-columns="true"
data-show-fullscreen="true"
data-show-export="true"
data-show-refresh="true"
data-sort-order="desc"