Merge pull request #8088 from Godmartinz/Label_Woes

Barcode resizing and text adjustment
This commit is contained in:
snipe 2020-05-27 23:01:33 -07:00 committed by GitHub
commit beae8efb21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,175 +1,167 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>Labels</title> <title>Labels</title>
</head> </head>
<body> <body>
<?php <?php
$settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter; $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter;
$settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter;
// Leave space on bottom for 1D barcode if necessary // Leave space on bottom for 1D barcode if necessary
$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - .3; $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - .3;
// Leave space on left for QR code if necessary ?>
$qr_txt_size = ($settings->qr_code=='1' ? $settings->labels_width - $qr_size - .1: $settings->labels_width);
?>
<style> <style>
body {
font-family: arial, helvetica, sans-serif;
width: {{ $settings->labels_pagewidth }}in;
height: {{ $settings->labels_pageheight }}in;
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in;
font-size: {{ $settings->labels_fontsize }}pt;
}
.label {
width: {{ $settings->labels_width }}in;
height: {{ $settings->labels_height }}in;
padding: 0in;
margin-right: {{ $settings->labels_display_sgutter }}in; /* the gutter */
margin-bottom: {{ $settings->labels_display_bgutter }}in;
display: inline-block;
overflow: hidden;
}
.page-break {
page-break-after:always;
}
div.qr_img {
width: {{ $qr_size }}in;
height: {{ $qr_size }}in;
body { float: left;
font-family: arial, helvetica, sans-serif; display: inline-flex;
width: {{ $settings->labels_pagewidth }}in; padding-right: .15in;
height: {{ $settings->labels_pageheight }}in; }
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in; img.qr_img {
font-size: {{ $settings->labels_fontsize }}pt;
}
.label { width: 120.79%;
width: {{ $settings->labels_width }}in; height: 120.79%;
height: {{ $settings->labels_height }}in; margin-top: -6.9%;
padding: 0in; margin-left: -6.9%;
margin-right: {{ $settings->labels_display_sgutter }}in; /* the gutter */ padding-bottom: .04in;
margin-bottom: {{ $settings->labels_display_bgutter }}in; }
display: inline-block; img.barcode {
overflow: hidden; display:block;
}
.page-break { padding-top: .11in;
page-break-after:always; width: 100%;
} }
.qr_text {
width: 100%;
height: auto;
padding-top: {{$settings->labels_display_bgutter}}in;
font-family: arial, helvetica, sans-serif;
font-size: x-small;
padding-right: .01in;
overflow: hidden !important;
display: inline;
word-wrap: break-word;
word-break: break-all;
}
div.barcode_container {
div.qr_img { width: 100%;
width: {{ $qr_size }}in; display: inline;
height: {{ $qr_size }}in; overflow: hidden;
float: left;
display: inline-block;
padding-right: .04in;
}
img.qr_img {
width: 100%;
height: 100%;
}
img.barcode {
display: block;
margin-left: auto;
margin-right: auto;
}
.qr_text {
width: {{ $qr_txt_size }}in;
height: {{ $qr_size }}in;
padding-top: .10in;
font-family: arial, helvetica, sans-serif;
padding-right: .01in;
overflow: hidden !important;
display: inline-block;
word-wrap: break-word;
word-break: break-all;
}
div.barcode_container {
float: left;
width: 100%;
display: inline;
height: 50px;
}
.next-padding {
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in;
}
@media print {
.noprint {
display: none !important;
} }
.next-padding { .next-padding {
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in; margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in;
font-size: 0;
} }
} @media print {
.noprint {
@media screen { display: none !important;
.label { }
outline: .02in black solid; /* outline doesn't occupy space like border does */ .next-padding {
margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in;
font-size: 0;
}
} }
.noprint { @media screen {
font-size: 13px; .label {
padding-bottom: 15px; outline: .02in black solid; /* outline doesn't occupy space like border does */
}
.noprint {
font-size: 13px;
padding-bottom: 15px;
}
} }
} @if ($snipeSettings->custom_css)
{{ $snipeSettings->show_custom_css() }}
@if ($snipeSettings->custom_css) @endif
{{ $snipeSettings->show_custom_css() }} </style>
@endif
</style>
@foreach ($assets as $asset) @foreach ($assets as $asset)
<?php $count++; ?> <?php $count++; ?>
<div class="label"> <div class="label">
@if ($settings->qr_code=='1') @if ($settings->qr_code=='1')
<div class="qr_img"> <div class="qr_img">
<img src="./{{ $asset->id }}/qr_code" class="qr_img"> <img src="./{{ $asset->id }}/qr_code" class="qr_img">
</div> </div>
@endif @endif
<div class="qr_text">
@if ($settings->qr_text!='')
<div class="pull-left">
<strong>{{ $settings->qr_text }}</strong>
<br>
</div>
@endif
@if (($settings->labels_display_company_name=='1') && ($asset->company))
<div class="pull-left">
C: {{ $asset->company->name }}
</div>
@endif
@if (($settings->labels_display_name=='1') && ($asset->name!=''))
<div class="pull-left">
N: {{ $asset->name }}
</div>
@endif
@if (($settings->labels_display_tag=='1') && ($asset->asset_tag!=''))
<div class="pull-left">
T: {{ $asset->asset_tag }}
</div>
@endif
@if (($settings->labels_display_serial=='1') && ($asset->serial!=''))
<div class="pull-left">
S: {{ $asset->serial }}
</div>
@endif
@if (($settings->labels_display_model=='1') && ($asset->model->name!=''))
<div class="pull-left">
M: {{ $asset->model->name }} {{ $asset->model->model_number }}
</div>
@endif
<div class="qr_text">
@if ($settings->qr_text!='')
<div class="pull-left">
<strong>{{ $settings->qr_text }}</strong>
<br>
</div> </div>
@if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))
<div class="barcode_container">
<img src="./{{ $asset->id }}/barcode" class="barcode">
</div>
@endif @endif
@if (($settings->labels_display_company_name=='1') && ($asset->company))
<div class="pull-left">
C: {{ $asset->company->name }}
</div>
@endif
@if (($settings->labels_display_name=='1') && ($asset->name!=''))
<div class="pull-left">
N: {{ $asset->name }}
</div>
@endif
@if (($settings->labels_display_tag=='1') && ($asset->asset_tag!=''))
<div class="pull-left">
T: {{ $asset->asset_tag }}
</div>
@endif
@if (($settings->labels_display_serial=='1') && ($asset->serial!=''))
<div class="pull-left">
S: {{ $asset->serial }}
</div>
@endif
@if (($settings->labels_display_model=='1') && ($asset->model->name!=''))
<div class="pull-left">
M: {{ $asset->model->name }} {{ $asset->model->model_number }}
</div>
@endif
</div> </div>
@if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!='')) @if ($count % $settings->labels_per_page == 0)
<div class="barcode_container"> <div class="page-break"></div>
<img src="./{{ $asset->id }}/barcode" class="barcode"> <div class="next-padding">&nbsp;</div>
</div>
@endif @endif
</div>
@if ($count % $settings->labels_per_page == 0)
<div class="page-break"></div>
<div class="next-padding">&nbsp;</div>
@endif
@endforeach @endforeach
</body> </body>
</html> </html>