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

Fixed some layout issues

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-11-01 19:06:49 -07:00
parent fa79a6c15f
commit 2106b64da6
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,6 +228,7 @@ class ConsumablesController extends Controller
foreach ($consumable->consumableAssignments as $consumable_assignment) { foreach ($consumable->consumableAssignments as $consumable_assignment) {
$rows[] = [ $rows[] = [
'avatar' => ($consumable_assignment->user) ? e($consumable_assignment->user->present()->gravatar) : '',
'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User', 'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User',
'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'), 'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),
'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null, 'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null,

34
resources/views/consumables/view.blade.php
View file

@ -21,12 +21,10 @@
<!-- Custom Tabs --> <!-- Custom Tabs -->
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs hidden-print"> <ul class="nav nav-tabs hidden-print">
<li class="active"> <li class="active">
<a href="#details" data-toggle="tab"> <a href="#checkedout" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
<i class="fas fa-info-circle fa-2x" aria-hidden="true"></i> <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
</span> </span>
@ -47,9 +45,12 @@
</li> </li>
@endcan @endcan
@can('update', \App\Models\Consumble::class) @can('update', Consumable::class)
<li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
<i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a> <li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
<i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
</a>
</li> </li>
@endcan @endcan
@ -57,9 +58,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="details"> <div class="tab-pane active" id="checkedout">
<div class="table-responsive"> <div class="table-responsive">
<table <table
@ -83,16 +82,18 @@
}'> }'>
<thead> <thead>
<tr> <tr>
<th data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.user') }}</th> <th data-searchable="false" data-sortable="false" data-field="avatar" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
<th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th> <th data-searchable="false" data-sortable="false" data-field="name" formatter="usersLinkFormatter">{{ trans('general.user') }}</th>
<th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">
{{ trans('general.date') }}
</th>
<th data-searchable="false" data-sortable="false" data-field="note">{{ trans('general.notes') }}</th> <th data-searchable="false" data-sortable="false" data-field="note">{{ trans('general.notes') }}</th>
<th data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.admin') }}</th> <th data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.admin') }}</th>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
</div> <!-- close tab-pane div -->
</div>
@can('consumables.files', $consumable) @can('consumables.files', $consumable)
@ -194,7 +195,6 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="box box-default"> <div class="box box-default">
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
@ -286,12 +286,12 @@
</div> <!-- /.col-md-3--> </div> <!-- /.col-md-3-->
</div> <!-- /.row--> </div> <!-- /.row-->
@stop
@can('update', \App\Models\Consumable::class) @can('update', \App\Models\Consumable::class)
@include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id])
@endcan @endcan
@stop
@section('moar_scripts') @section('moar_scripts')
@include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false]) @include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false])

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

@ -632,10 +632,14 @@
if (value) { if (value) {
if (row.name) { // This is a clunky override to handle unusual API responses where we're presenting a link instead of an array
if (row.avatar) {
var altName = '';
}
else if (row.name) {
var altName = row.name; var altName = row.name;
} }
else if ((row) && (row.model)) { else if ((row) && (row.model)) {
var altName = row.model.name; var altName = row.model.name;
} }
return '<a href="' + value + '" data-toggle="lightbox" data-type="image"><img src="' + value + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="' + altName + '"></a>'; return '<a href="' + value + '" data-toggle="lightbox" data-type="image"><img src="' + value + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="' + altName + '"></a>';