DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-05-09 20:14:44 -07:00
parent ec4697fd3e 6a7bab453f
commit cbe70c9cc1
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
resources/views/accessories/view.blade.php
View file

@ -257,10 +257,10 @@
@if ($accessory->company) @if ($accessory->company)
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-bottom: 15px;"> <div class="col-md-3" style="padding-bottom: 15px;">
<strong> {{ trans('general.company')}}</strong> <strong> {{ trans('general.company')}}</strong>
</div> </div>
<div class="col-md-8"> <div class="col-md-9">
<a href="{{ route('companies.show', $accessory->company->id) }}">{{ $accessory->company->name }} </a> <a href="{{ route('companies.show', $accessory->company->id) }}">{{ $accessory->company->name }} </a>
</div> </div>
</div> </div>
@ -269,10 +269,10 @@
@if ($accessory->category) @if ($accessory->category)
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-bottom: 15px;"> <div class="col-md-3" style="padding-bottom: 10px;">
<strong>{{ trans('general.category')}}</strong> <strong>{{ trans('general.category')}}</strong>
</div> </div>
<div class="col-md-8"> <div class="col-md-9">
<a href="{{ route('categories.show', $accessory->category->id) }}">{{ $accessory->category->name }} </a> <a href="{{ route('categories.show', $accessory->category->id) }}">{{ $accessory->category->name }} </a>
</div> </div>
</div> </div>
@ -280,33 +280,34 @@
@if ($accessory->notes) @if ($accessory->notes)
<div class="row">
<div class="col-md-12"> <div class="col-md-3" style="padding-bottom: 10px;">
<strong> <strong>
{{ trans('general.notes') }} {{ trans('general.notes') }}
</strong> </strong>
</div> </div>
<div class="col-md-12"> <div class="col-md-9">
{!! nl2br(e($accessory->notes)) !!} {!! nl2br(e($accessory->notes)) !!}
</div> </div>
</div>
@endif @endif
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-bottom: 15px;"> <div class="col-md-3" style="padding-bottom: 10px;">
<strong>{{ trans('admin/accessories/general.remaining') }}</strong> <strong>{{ trans('admin/accessories/general.remaining') }}</strong>
</div> </div>
<div class="col-md-8"> <div class="col-md-9">
{{ $accessory->numRemaining() }} {{ $accessory->numRemaining() }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4" style="padding-bottom: 15px;"> <div class="col-md-3" style="padding-bottom: 10px;">
<strong>{{ trans('general.checked_out') }}</strong> <strong>{{ trans('general.checked_out') }}</strong>
</div> </div>
<div class="col-md-8"> <div class="col-md-9">
{{ $accessory->users_count }} {{ $accessory->users_count }}
</div> </div>
</div> </div>