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

Fixed label weirdness when no serial

Browse source
This commit is contained in:
snipe 2016-06-10 04:43:17 -07:00
parent a0901247a3
commit 7a9cfb1a8f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
resources/views/hardware/labels.blade.php
View file

@ -93,7 +93,7 @@
@foreach ($assets as $asset) @foreach ($assets as $asset)
<?php $count++; ?> <?php $count++; ?>
<div class="label" {!! ($count % $settings->labels_per_page == 0) ? 'style="margin-bottom: 0px;"' : '' !!}> <div class="label"{!! ($count % $settings->labels_per_page == 0) ? ' style="margin-bottom: 0px;"' : '' !!}>
@if ($settings->qr_code=='1') @if ($settings->qr_code=='1')
<div class="qr_img"> <div class="qr_img">
@ -102,23 +102,28 @@
@endif @endif
<div class="qr_text"> <div class="qr_text">
<div class="pull-left">
@if ($settings->qr_text!='') @if ($settings->qr_text!='')
<strong>{{ $settings->qr_text }}</strong> <strong>{{ $settings->qr_text }}</strong>
<br> <br>
@endif @endif
</div>
<div class="pull-left">
@if (($settings->labels_display_name=='1') && ($asset->name!='')) @if (($settings->labels_display_name=='1') && ($asset->name!=''))
N: {{ $asset->name }} N: {{ $asset->name }}
<br>
@endif @endif
</div>
<div class="pull-left">
@if (($settings->labels_display_tag=='1') && ($asset->asset_tag!='')) @if (($settings->labels_display_tag=='1') && ($asset->asset_tag!=''))
T: {{ $asset->asset_tag }} T: {{ $asset->asset_tag }}
<br>
@endif @endif
</div>
<div class="pull-left">
@if (($settings->labels_display_serial=='1') && ($asset->serial!='')) @if (($settings->labels_display_serial=='1') && ($asset->serial!=''))
S: {{ $asset->serial }} S: {{ $asset->serial }}
@endif @endif
</div>
</div> </div>
@if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!='')) @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))