DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 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 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/build/app.css
View file

Binary file not shown.

BIN
public/css/build/overrides.css
View file

Binary file not shown.

BIN
public/css/dist/all.css vendored
View file

Binary file not shown.

6
public/mix-manifest.json
View file

@ -1,8 +1,8 @@
{
"/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=51d7091a9d7a8a2bc841",
"/css/build/overrides.css": "/css/build/overrides.css?id=21281fb933786f40e97c",
"/css/build/app.css": "/css/build/app.css?id=a05de1e55dcc50ddba9a",
"/css/build/overrides.css": "/css/build/overrides.css?id=1aab716e7e6411467e18",
"/css/build/app.css": "/css/build/app.css?id=cf91a7f91fd0c5488a34",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=40a6f3c46ef38d996f49",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=43b0bd45828351b50a0c",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6ff44e5e81cb3e2ce53",
@ -18,7 +18,7 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=07bd8920490cc3c0364e",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=3654491c6565f7dc9bb4",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=9d753f6f06a2941d9b97",
"/css/dist/all.css": "/css/dist/all.css?id=b657d018489da88020dd",
"/css/dist/all.css": "/css/dist/all.css?id=d464ef388a3b0915a38f",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",

4
resources/assets/less/overrides.less
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;
}
/**

1
resources/views/accessories/index.blade.php
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"

1
resources/views/accessories/view.blade.php
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"

1
resources/views/asset_maintenances/index.blade.php
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"

1
resources/views/categories/index.blade.php
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"

1
resources/views/companies/index.blade.php
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"

1
resources/views/components/index.blade.php
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"

1
resources/views/consumables/index.blade.php
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"

1
resources/views/departments/index.blade.php
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"

1
resources/views/groups/index.blade.php
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"

1
resources/views/hardware/audit-due.blade.php
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"

1
resources/views/hardware/audit-overdue.blade.php
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"

1
resources/views/hardware/index.blade.php
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"

4
resources/views/hardware/view.blade.php
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"

1
resources/views/kits/index.blade.php
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"

1
resources/views/licenses/index.blade.php
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"

1
resources/views/licenses/view.blade.php
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"

1
resources/views/locations/index.blade.php
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"

1
resources/views/manufacturers/index.blade.php
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"

2
resources/views/manufacturers/view.blade.php
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"

1
resources/views/models/view.blade.php
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"

1
resources/views/partials/bootstrap-table.blade.php
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',

1
resources/views/statuslabels/index.blade.php
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"

1
resources/views/statuslabels/view.blade.php
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"

1
resources/views/suppliers/index.blade.php
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"

4
resources/views/suppliers/view.blade.php
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"

1
resources/views/users/index.blade.php
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"

6
resources/views/users/view.blade.php
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"