lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-10-18 15:00:51 -07:00
commit 4e83b06d71
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/kits/model-edit.blade.php
View file

@ -1,6 +1,6 @@
@extends('layouts/edit-form', [ @extends('layouts/edit-form', [
'createText' => {{ trans(admin/kits/general.append_model) }}, 'createText' => trans('admin/kits/general.append_model'),
'updateText' => {{ trans(admin/kits/general.update_appended_model) }}, 'updateText' => trans('admin/kits/general.update_appended_model'),
'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]), 'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
]) ])

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

@ -21,7 +21,7 @@
<li class="active"> <li class="active">
<a href="#users" data-toggle="tab"> <a href="#users" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-info-circle fa-2x"></i> <i class="fas fa-users fa-2x"></i>
</span> </span>
<span class="hidden-xs hidden-sm"> <span class="hidden-xs hidden-sm">
{{ trans('general.users') }} {{ trans('general.users') }}
@ -46,7 +46,7 @@
<li> <li>
<a href="#accessories" data-toggle="tab"> <a href="#accessories" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x" aria-hidden="true"></i> <i class="fas fa-keyboard fa-2x" aria-hidden="true"></i>
</span> </span>
<span class="hidden-xs hidden-sm"> <span class="hidden-xs hidden-sm">
{{ trans('general.accessories') }} {{ trans('general.accessories') }}
@ -58,7 +58,7 @@
<li> <li>
<a href="#consumables" data-toggle="tab"> <a href="#consumables" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x" aria-hidden="true"></i> <i class="fas fa-tint fa-2x" aria-hidden="true"></i>
</span> </span>
<span class="hidden-xs hidden-sm"> <span class="hidden-xs hidden-sm">
{{ trans('general.consumables') }} {{ trans('general.consumables') }}
@ -70,7 +70,7 @@
<li> <li>
<a href="#components" data-toggle="tab"> <a href="#components" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x" aria-hidden="true"></i> <i class="fas fa-hdd fa-2x" aria-hidden="true"></i>
</span> </span>
<span class="hidden-xs hidden-sm"> <span class="hidden-xs hidden-sm">
{{ trans('general.components') }} {{ trans('general.components') }}
@ -144,7 +144,7 @@
</div><!-- /.table-responsive --> </div><!-- /.table-responsive -->
</div><!-- /.tab-pane --> </div><!-- /.tab-pane -->
<div class="tab-pane" id="accessories"> <div class="tab-pane" id="accessories">