From ed23505054cd1bdf2ef695b6b010e025382f38da Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 May 2020 17:10:45 -0700 Subject: [PATCH 1/4] Label_Woes --- resources/views/hardware/labels.blade.php | 294 +++++++++++----------- 1 file changed, 150 insertions(+), 144 deletions(-) diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index b0a83031c5c1..5df4c507efdb 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -1,175 +1,181 @@ - - Labels + + Labels - labels_width = $settings->labels_width - $settings->labels_display_sgutter; - $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; - // 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; - // 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); - ?> - - + @foreach ($assets as $asset) - -
- - @if ($settings->qr_code=='1') -
- -
- @endif + +
-
- @if ($settings->qr_text!='') -
- {{ $settings->qr_text }} -
-
- @endif - @if (($settings->labels_display_company_name=='1') && ($asset->company)) -
- C: {{ $asset->company->name }} -
- @endif - @if (($settings->labels_display_name=='1') && ($asset->name!='')) -
- N: {{ $asset->name }} -
+ @if ($settings->qr_code=='1') +
+ +
@endif - @if (($settings->labels_display_tag=='1') && ($asset->asset_tag!='')) -
- T: {{ $asset->asset_tag }} -
- @endif - @if (($settings->labels_display_serial=='1') && ($asset->serial!='')) -
- S: {{ $asset->serial }} -
- @endif - @if (($settings->labels_display_model=='1') && ($asset->model->name!='')) -
- M: {{ $asset->model->name }} {{ $asset->model->model_number }} -
- @endif -
+
+ @if ($settings->qr_text!='') +
+ {{ $settings->qr_text }} +
+
+ @endif + @if (($settings->labels_display_company_name=='1') && ($asset->company)) +
+ C: {{ $asset->company->name }} +
+ @endif + @if (($settings->labels_display_name=='1') && ($asset->name!='')) +
+ N: {{ $asset->name }} +
+ @endif + @if (($settings->labels_display_tag=='1') && ($asset->asset_tag!='')) +
+ T: {{ $asset->asset_tag }} +
+ @endif + @if (($settings->labels_display_serial=='1') && ($asset->serial!='')) +
+ S: {{ $asset->serial }} +
+ @endif + @if (($settings->labels_display_model=='1') && ($asset->model->name!='')) +
+ M: {{ $asset->model->name }} {{ $asset->model->model_number }} +
+ @endif - @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!='')) -
-
- @endif + + @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!='')) +
+ +
+ @endif -
+
-@if ($count % $settings->labels_per_page == 0) -
-
 
-@endif + @if ($count % $settings->labels_per_page == 0) +
+
 
+ @endif @endforeach - + \ No newline at end of file From e97cf011b65df9e66826c26464fed7bf4001917a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 May 2020 17:15:39 -0700 Subject: [PATCH 2/4] Label_Woes --- resources/views/hardware/labels.blade.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index 5df4c507efdb..34f2d1b0b196 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -17,7 +17,6 @@ ?> @foreach ($assets as $asset) From e7f74d94c179730f8b8502da5e2c1c90fa8ec594 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 May 2020 17:22:45 -0700 Subject: [PATCH 3/4] Label_Woes --- resources/views/hardware/labels.blade.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index 34f2d1b0b196..2fbaaf2d963c 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -36,7 +36,6 @@ .page-break { page-break-after:always; } - div.qr_img { width: {{ $qr_size }}in; height: {{ $qr_size }}in; @@ -59,7 +58,6 @@ padding-top: .11in; width: 100%; } - .qr_text { width: 100%; height: auto; @@ -71,14 +69,12 @@ word-wrap: break-word; word-break: break-all; } - div.barcode_container { width: 100%; display: inline; overflow: hidden; } - .next-padding { margin: {{ $settings->labels_pmargin_top }}in {{ $settings->labels_pmargin_right }}in {{ $settings->labels_pmargin_bottom }}in {{ $settings->labels_pmargin_left }}in; } From 9839e5e566f51f85abe6860dfc8377042834c89b Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 27 May 2020 12:27:40 -0700 Subject: [PATCH 4/4] adjusted for all label text, removed local variable --- resources/views/hardware/labels.blade.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index 2fbaaf2d963c..a23f8847e1dd 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -12,8 +12,6 @@ $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; // 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; -// 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); ?>