Merge pull request #15360 from snipe/more_print_fixes

More print fixes for asset view
This commit is contained in:
snipe 2024-08-22 11:17:49 +01:00 committed by GitHub
commit 4635a6efc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1120,7 +1120,7 @@
</table> </table>
@else @else
<div class="alert alert-info alert-block"> <div class="alert alert-info alert-block hidden-print">
<x-icon type="info-circle" /> <x-icon type="info-circle" />
{{ trans('general.no_results') }} {{ trans('general.no_results') }}
</div> </div>
@ -1157,7 +1157,7 @@
<td>{{ Helper::formatCurrencyOutput($component->purchase_cost) }} each</td> <td>{{ Helper::formatCurrencyOutput($component->purchase_cost) }} each</td>
<td>{{ $component->serial }}</td> <td>{{ $component->serial }}</td>
<td> <td>
<a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a> <a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple hidden-print" data-tooltip="true">{{ trans('general.checkin') }}</a>
</td> </td>
<?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?> <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
@ -1175,7 +1175,7 @@
</tfoot> </tfoot>
</table> </table>
@else @else
<div class="alert alert-info alert-block"> <div class="alert alert-info alert-block hidden-print">
<x-icon type="info-circle" /> <x-icon type="info-circle" />
{{ trans('general.no_results') }} {{ trans('general.no_results') }}
</div> </div>
@ -1239,7 +1239,7 @@
@else @else
<div class="alert alert-info alert-block"> <div class="alert alert-info alert-block hidden-print">
<x-icon type="info-circle" /> <x-icon type="info-circle" />
{{ trans('general.no_results') }} {{ trans('general.no_results') }}
</div> </div>
@ -1399,11 +1399,11 @@
</td> </td>
<td> <td>
@if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename))) @if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename)))
<a href="{{ route('show/assetfile', [$asset->id, $file->id, 'download'=>'true']) }}" class="btn btn-sm btn-default"> <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'download'=>'true']) }}" class="btn btn-sm btn-default hidden-print">
<x-icon type="download" /> <x-icon type="download" />
</a> </a>
<a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank"> <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default hidden-print" target="_blank">
<x-icon type="external-link" /> <x-icon type="external-link" />
</a> </a>
@endif @endif
@ -1415,7 +1415,7 @@
</td> </td>
<td> <td>
@can('update', \App\Models\Asset::class) @can('update', \App\Models\Asset::class)
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"> <a class="btn delete-asset btn-sm btn-danger btn-sm hidden-print" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
<x-icon type="delete" /> <x-icon type="delete" />
</a> </a>
@endcan @endcan
@ -1427,7 +1427,7 @@
@else @else
<div class="alert alert-info alert-block"> <div class="alert alert-info alert-block hidden-print">
<x-icon type="info-circle" /> <x-icon type="info-circle" />
{{ trans('general.no_results') }} {{ trans('general.no_results') }}
</div> </div>
@ -1503,12 +1503,12 @@
</td> </td>
<td> <td>
@if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename))) @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
<a href="{{ route('show/modelfile', [$asset->model->id, $file->id]) }}" class="btn btn-sm btn-default"> <a href="{{ route('show/modelfile', [$asset->model->id, $file->id]) }}" class="btn btn-sm btn-default hidden-print">
<x-icon type="download" /> <x-icon type="download" class="hidden-print" />
</a> </a>
<a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank"> <a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default hidden-print" target="_blank">
<x-icon type="external-link" /> <x-icon type="external-link" class="hidden-print" />
</a> </a>
@endif @endif
@ -1520,8 +1520,8 @@
</td> </td>
<td> <td>
@can('update', \App\Models\AssetModel::class) @can('update', \App\Models\AssetModel::class)
<a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"> <a class="btn delete-asset btn-sm btn-danger btn-sm hidden-print" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}">
<x-icon type="delete" /></i> <x-icon type="delete" class="hidden-print"/></i>
</a> </a>
@endcan @endcan
</td> </td>