Skip to content

Commit 7ee9a69

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 5ba94c6 + bef5498 commit 7ee9a69

File tree

4 files changed

+45
-44
lines changed

4 files changed

+45
-44
lines changed

‎resources/lang/en-US/admin/settings/general.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@
369369
'label2_2d_target_help' => 'The data that will be contained in the 2D barcode',
370370
'label2_fields' => 'Field Definitions',
371371
'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.',
372+
'purge_barcodes' => 'Purge Barcodes',
372373
'help_asterisk_bold' => 'Text entered as <code>**text**</code> will be displayed as bold',
373374
'help_blank_to_use' => 'Leave blank to use the value from <code>:setting_name</code>',
374375
'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',

‎resources/views/partials/forms/edit/company-select.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@if (($snipeSettings->full_multiple_companies_support=='1') && (!Auth::user()->isSuperUser()))
33
<!-- full company support is enabled and this user isn't a superadmin -->
44
<div class="form-group">
5-
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
5+
<label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
66
<div class="col-md-6">
77
<select class="js-data-ajax" disabled="true" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
88
@if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
@@ -19,7 +19,7 @@
1919
@else
2020
<!-- full company support is enabled or this user is a superadmin -->
2121
<div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
22-
{{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
22+
<label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
2323
<div class="col-md-8">
2424
<select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
2525
@isset ($selected)

‎resources/views/settings/labels.blade.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
4646
<label class="form-control">
4747
<input type="checkbox" value="1" name="label2_enable"{{ ((old('label2_enable') == '1') || ($setting->label2_enable) == '1') ? ' checked="checked"' : '' }} aria-label="label2_enable">
48-
{{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }}
48+
<label for="label2_enable">{{ trans('admin/settings/general.label2_enable') }}</label>
4949
</label>
5050
5151
{!! $errors->first('label2_enable', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -105,7 +105,7 @@ class="table table-striped snipe-table"
105105
<!-- Title -->
106106
<div class="form-group{{ $errors->has('label2_title') ? ' has-error' : '' }}">
107107
<div class="col-md-3 text-right">
108-
{{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
108+
<label for="label2_title" class="control-label">{{trans('admin/settings/general.label2_title')}}</label>
109109
</div>
110110
<div class="col-md-7">
111111
<input class="form-control" aria-label="label2_title" name="label2_title" type="text" id="label2_title" value="{{ old('label2_title', $setting->label2_title) }}">
@@ -129,7 +129,7 @@ class="table table-striped snipe-table"
129129
130130
<label class="form-control">
131131
<input type="checkbox" value="1" name="label2_asset_logo"{{ ((old('label2_asset_logo') == '1') || ($setting->label2_asset_logo) == '1') ? ' checked="checked"' : '' }} aria-label="label2_asset_logo">
132-
{{ Form::label('label2_asset_logo', trans('admin/settings/general.label2_asset_logo')) }}
132+
<label for="label2_asset_logo">{{ trans('admin/settings/general.label2_asset_logo') }}</label>
133133
</label>
134134
<p class="help-block">
135135
{!! trans('admin/settings/general.label2_asset_logo_help', ['setting_name' => trans('admin/settings/general.brand').' &gt; '.trans('admin/settings/general.label_logo')]) !!}
@@ -155,7 +155,7 @@ class="table table-striped snipe-table"
155155
<!-- 1D Barcode Type -->
156156
<div class="form-group{{ $errors->has('label2_1d_type') ? ' has-error' : '' }}">
157157
<div class="col-md-3 text-right">
158-
{{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }}
158+
<label for="label2_1d_type" class="control-label">{{ trans('admin/settings/general.label2_1d_type') }}</label>
159159
</div>
160160
<div class="col-md-7">
161161
@php
@@ -198,7 +198,7 @@ class="table table-striped snipe-table"
198198
<!-- 2D Barcode Type -->
199199
<div class="form-group{{ $errors->has('label2_2d_type') ? ' has-error' : '' }}">
200200
<div class="col-md-3 text-right">
201-
{{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }}
201+
<label for="label2_2d_type" class="control-label">{{ trans('admin/settings/general.label2_2d_type') }}</label>
202202
</div>
203203
<div class="col-md-7">
204204
@php
@@ -228,7 +228,7 @@ class="table table-striped snipe-table"
228228
<!-- QR Text -->
229229
<div class="form-group{{ $errors->has('qr_text') ? ' has-error' : '' }}">
230230
<div class="col-md-3 text-right">
231-
{{ Form::label('qr_text', trans('admin/settings/general.qr_text'), ['class'=>'control-label']) }}
231+
<label for="qr_text" class="control-label">{{ trans('admin/settings/general.qr_text') }}</label>
232232
</div>
233233
<div class="col-md-7">
234234
@if ($setting->qr_code == 1)
@@ -263,7 +263,7 @@ class="form-control"
263263
<!-- Nuke barcode cache -->
264264
<div class="form-group">
265265
<div class="col-md-3 text-right">
266-
{{ Form::label('purge_barcodes', 'Purge Barcodes', ['class'=>'control-label']) }}
266+
<label for="purge_barcodes" class="control-label">{{ trans('admin/settings/general.purge_barcodes') }}</label>
267267
</div>
268268
<div class="col-md-7">
269269
<a class="btn btn-default btn-sm pull-left" id="purgebarcodes" style="margin-right: 10px;">
@@ -281,7 +281,7 @@ class="form-control"
281281
<!-- 2D Barcode Target -->
282282
<div class="form-group{{ $errors->has('label2_2d_target') ? ' has-error' : '' }}">
283283
<div class="col-md-3 text-right">
284-
{{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
284+
<label for="label2_2d_target" class="control-label">{{ trans('admin/settings/general.label2_2d_target') }}</label>
285285
</div>
286286
<div class="col-md-9">
287287
{{ Form::select('label2_2d_target', [
@@ -301,7 +301,7 @@ class="form-control"
301301
<!-- Fields -->
302302
<div class="form-group {{ $errors->has('label2_fields') ? 'error' : '' }}">
303303
<div class="col-md-3 text-right">
304-
{{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
304+
<label for="label2_fields">{{ trans('admin/settings/general.label2_fields') }}</label>
305305
</div>
306306
<div class="col-md-9">
307307
@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 @@ class="form-control"
353353

354354
<div class="form-group{{ $errors->has('labels_per_page') ? ' has-error' : '' }}">
355355
<div class="col-md-3 text-right">
356-
{{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page'), ['class'=>'control-label']) }}
356+
<label for="labels_per_page" class="control-label">{{ trans('admin/settings/general.labels_per_page') }}</label>
357357
</div>
358358
<div class="col-md-9">
359359
<input class="form-control" style="width: 100px;" aria-label="labels_per_page" name="labels_per_page" type="text" value="{{ old('labels_per_page', $setting->labels_per_page) }}" id="labels_per_page">
@@ -363,7 +363,7 @@ class="form-control"
363363

364364
<div class="form-group{{ $errors->has('labels_fontsize') ? ' has-error' : '' }}">
365365
<div class="col-md-3 text-right">
366-
{{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize'), ['class'=>'control-label']) }}
366+
<label for="labels_fontsize" class="control-label">{{ trans('admin/settings/general.labels_fontsize') }}</label>
367367
</div>
368368
<div class="col-md-2">
369369
<div class="input-group">
@@ -378,7 +378,7 @@ class="form-control"
378378

379379
<div class="form-group{{ $errors->has('labels_width') ? ' has-error' : '' }}">
380380
<div class="col-md-3 text-right">
381-
{{ Form::label('labels_width', trans('admin/settings/general.label_dimensions'), ['class'=>'control-label']) }}
381+
<label for="labels_width" class="control-label">{{ trans('admin/settings/general.label_dimensions') }}</label>
382382
</div>
383383
<div class="col-md-3">
384384
<div class="input-group">
@@ -400,7 +400,7 @@ class="form-control"
400400

401401
<div class="form-group{{ $errors->has('labels_display_sgutter') ? ' has-error' : '' }}">
402402
<div class="col-md-3 text-right">
403-
{{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
403+
<label for="labels_display_sgutter">{{ trans('admin/settings/general.label_gutters') }}</label>
404404
</div>
405405
<div class="col-md-3">
406406
<div class="input-group">
@@ -422,7 +422,7 @@ class="form-control"
422422

423423
<div class="form-group{{ $errors->has('labels_pmargin_top') ? ' has-error' : '' }}">
424424
<div class="col-md-3 text-right">
425-
{{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
425+
<label for="labels_pmargin_top">{{ trans('admin/settings/general.page_padding') }}</label>
426426
</div>
427427
<div class="col-md-3">
428428
<div class="input-group" style="margin-bottom: 15px;">
@@ -453,7 +453,7 @@ class="form-control"
453453

454454
<div class="form-group{{ (($errors->has('labels_pageheight')) || $errors->has('labels_pagewidth')) ? ' has-error' : '' }}">
455455
<div class="col-md-3 text-right">
456-
{{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions'), ['class'=>'control-label']) }}
456+
<label for="labels_pagewidth" class="control-label">{{ trans('admin/settings/general.page_dimensions') }}</label>
457457
</div>
458458
<div class="col-md-3">
459459
<div class="input-group">
@@ -476,7 +476,7 @@ class="form-control"
476476
@if(!$setting->label2_enable)
477477
<div class="form-group">
478478
<div class="col-md-3 text-right">
479-
{{ Form::label('labels_display', trans('admin/settings/general.label_fields'), ['class' => 'control-label']) }}
479+
<label for="labels_display" class="control-label">{{ trans('admin/settings/general.label_fields') }}</label>
480480
</div>
481481
<div class="col-md-9">
482482
<label class="form-control">

0 commit comments

Comments
 (0)