From 6c71e72dcdbf211323396d7c6cf023e44fdfa5be Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 13 Mar 2019 19:50:35 -0700
Subject: [PATCH] Fixed labels labels (wha?)

Wrong HTML labels for some fields in the Settings > Labels page.

Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
---
 resources/views/settings/labels.blade.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index b5aa103f5..ac9bf7d6d 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -50,9 +50,9 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
+                        <div class="form-group {{ $errors->has('labels_fontsize') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('labels_width', trans('admin/settings/general.labels_fontsize')) }}
+                                {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize')) }}
                             </div>
                             <div class="col-md-2 form-group">
                                 <div class="input-group">
@@ -87,9 +87,9 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
+                        <div class="form-group {{ $errors->has('labels_display_sgutter') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('labels_width', trans('admin/settings/general.label_gutters')) }}
+                                {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
                             </div>
                             <div class="col-md-3 form-group">
                                 <div class="input-group">
@@ -109,9 +109,9 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
+                        <div class="form-group {{ $errors->has('labels_pmargin_top') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('labels_width', trans('admin/settings/general.page_padding')) }}
+                                {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
                             </div>
                             <div class="col-md-3 form-group">
                                 <div class="input-group" style="margin-bottom: 15px;">
@@ -139,9 +139,9 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{ $errors->has('labels_pageheight') ? 'error' : '' }}">
+                        <div class="form-group {{ (($errors->has('labels_pageheight') || $errors->has('labels_pagewidth')) ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('labels_width', trans('admin/settings/general.page_dimensions')) }}
+                                {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions')) }}
                             </div>
                             <div class="col-md-3 form-group">
                                 <div class="input-group">