diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index efe74a806..ce19ed47f 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -369,6 +369,7 @@ return [ 'label2_2d_target_help' => 'The data that will be contained in the 2D barcode', 'label2_fields' => 'Field Definitions', 'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.', + 'purge_barcodes' => 'Purge Barcodes', 'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold', 'help_blank_to_use' => 'Leave blank to use the value from :setting_name', 'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ', diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index e4fee660a..33bd46220 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -45,7 +45,7 @@ {!! $errors->first('label2_enable', '') !!} @@ -105,7 +105,7 @@
- {{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }} +
@@ -129,7 +129,7 @@

{!! trans('admin/settings/general.label2_asset_logo_help', ['setting_name' => trans('admin/settings/general.brand').' > '.trans('admin/settings/general.label_logo')]) !!} @@ -155,7 +155,7 @@

- {{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }} +
@php @@ -198,7 +198,7 @@
- {{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }} +
@php @@ -228,7 +228,7 @@
- {{ Form::label('qr_text', trans('admin/settings/general.qr_text'), ['class'=>'control-label']) }} +
@if ($setting->qr_code == 1) @@ -263,7 +263,7 @@
- {{ Form::label('purge_barcodes', 'Purge Barcodes', ['class'=>'control-label']) }} +
@@ -281,7 +281,7 @@
- {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }} +
{{ Form::select('label2_2d_target', [ @@ -301,7 +301,7 @@
- {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }} +
@include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields, 'template' => $setting->label2_template]) @@ -353,7 +353,7 @@
- {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page'), ['class'=>'control-label']) }} +
@@ -363,7 +363,7 @@
- {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize'), ['class'=>'control-label']) }} +
@@ -378,7 +378,7 @@
- {{ Form::label('labels_width', trans('admin/settings/general.label_dimensions'), ['class'=>'control-label']) }} +
@@ -400,7 +400,7 @@
- {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }} +
@@ -422,7 +422,7 @@
- {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }} +
@@ -453,7 +453,7 @@
- {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions'), ['class'=>'control-label']) }} +
@@ -476,7 +476,7 @@ @if(!$setting->label2_enable)
- {{ Form::label('labels_display', trans('admin/settings/general.label_fields'), ['class' => 'control-label']) }} +