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

Added alt keyboard

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-08-12 14:19:15 +01:00
parent 852a233086
commit 7c2f994c3a
10 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Api/LocationsController.php
View file

@ -75,6 +75,7 @@ class LocationsController extends Controller
])->withCount('assignedAssets as assigned_assets_count')
->withCount('assets as assets_count')
->withCount('assignedAccessories as assigned_accessories_count')
->withCount('accessories as accessories_count')
->withCount('rtd_assets as rtd_assets_count')
->withCount('children as children_count')
->withCount('users as users_count');

1
app/Http/Transformers/LocationsTransformer.php
View file

@ -46,6 +46,7 @@ class LocationsTransformer
'phone' => ($location->phone!='') ? e($location->phone): null,
'fax' => ($location->fax!='') ? e($location->fax): null,
'assigned_assets_count' => (int) $location->assigned_assets_count,
'accessories_count' => (int) $location->assigned_accessories,
'assigned_accessories_count' => (int) $location->assigned_accessories_count,
'assets_count' => (int) $location->assets_count,
'rtd_assets_count' => (int) $location->rtd_assets_count,

18
app/Presenters/LocationPresenter.php
View file

@ -70,9 +70,10 @@ class LocationPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('admin/hardware/form.default_location'),
'titleTooltip' => trans('admin/hardware/form.default_location'),
'tooltip' => 'true',
'visible' => false,
'class' => 'css-house-flag',
'tooltip' => true,
],
[
@ -81,6 +82,7 @@ class LocationPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('admin/locations/message.assigned_assets'),
'titleTooltip' => trans('admin/locations/message.assigned_assets'),
'visible' => true,
'class' => 'css-house-laptop',
],
@ -89,16 +91,28 @@ class LocationPresenter extends Presenter
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('general.accessories_assigned'),
'title' => trans('general.accessories'),
'titleTooltip' => trans('general.accessories'),
'visible' => true,
'class' => 'css-accessory',
],
[
'field' => 'assigned_accessories_count',
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('general.accessories_assigned'),
'titleTooltip' => trans('general.accessories_assigned'),
'visible' => true,
'class' => 'css-accessory-alt',
],
[
'field' => 'users_count',
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('general.people'),
'titleTooltip' => trans('general.people'),
'visible' => true,
'class' => 'css-house-user',
],

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

@ -2,8 +2,8 @@
"/js/build/app.js": "/js/build/app.js?id=da3f7fee4a180ba924f6a3920c94eb71",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9",
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f4397c717b99fce41a633ca6edd5d1f4",
"/css/build/overrides.css": "/css/build/overrides.css?id=c4d85e7547ae9ddbb5aef45729d73f20",
"/css/build/app.css": "/css/build/app.css?id=c953eea1937a2c5f78dfc8fe411324ae",
"/css/build/overrides.css": "/css/build/overrides.css?id=ea66574be6a42601abd07ca02f43060f",
"/css/build/app.css": "/css/build/app.css?id=e4d85acd9b8f14a91378b4b180ae22dc",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7",
@ -19,7 +19,7 @@
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
"/css/dist/all.css": "/css/dist/all.css?id=7669e3b5dff0e448ae3ed2d6c38fc06a",
"/css/dist/all.css": "/css/dist/all.css?id=e6be50490a74eff42d177d942686de2b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

8
resources/assets/less/overrides.less
View file

@ -590,6 +590,7 @@ th.css-location > .th-inner,
th.css-house-user > .th-inner,
th.css-house-flag > .th-inner,
th.css-house-laptop > .th-inner,
th.css-accessory-alt > .th-inner,
th.css-accessory > .th-inner {
font-size: 0px;
line-height: 0.75 !important;
@ -609,6 +610,7 @@ th.css-location > .th-inner::before,
th.css-house-user > .th-inner::before,
th.css-house-laptop > .th-inner::before,
th.css-house-flag > .th-inner::before,
th.css-accessory-alt > .th-inner::before,
th.css-accessory > .th-inner::before
{
display: inline-block;
@ -681,6 +683,12 @@ th.css-house-laptop > .th-inner::before {
font-size: 19px;
margin-bottom: 0px;
}
th.css-accessory-alt > .th-inner::before {
content: "\f11c";
font-family: "Font Awesome 5 Free";
font-size: 19px;
margin-bottom: 0px;
}
.small-box .inner {
padding-left: 15px;

27
resources/views/locations/view.blade.php
View file

@ -75,6 +75,20 @@
</li>
@endif
@if ($location->accessories->count() > 0)
<li>
<a href="#accessories" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories') }}">
<i class="far fa-keyboard" style="font-size: 18px" aria-hidden="true"></i>
<span class="badge">
{{ number_format($location->accessories->count()) }}
</span>
<span class="sr-only">
{{ trans('general.accessories') }}
</span>
</a>
</li>
@endif
@if ($location->assignedAccessories->count() > 0)
<li>
<a href="#accessories_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories_assigned') }}">
@ -89,19 +103,6 @@
</li>
@endif
@if ($location->accessories->count() > 0)
<li>
<a href="#accessories" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories') }}">
<i class="fas fa-keyboard" style="font-size: 18px" aria-hidden="true"></i>
<span class="badge">
{{ number_format($location->accessories->count()) }}
</span>
<span class="sr-only">
{{ trans('general.accessories') }}
</span>
</a>
</li>
@endif
@if ($location->consumables->count() > 0)
<li>

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

@ -410,6 +410,8 @@
}
}
// Check if checkbox should be selectable
// Selectability is determined by the API field "selectable" which is set at the Presenter/API Transformer
// However since different bulk actions have different requirements, we have to walk through the available_actions object