Skip to content

Commit 2f31bfc

Browse files
snipesnipe
committed
Fixed some HTML labels in settings
1 parent 8d0c88d commit 2f31bfc

File tree

11 files changed

+295
-298
lines changed

11 files changed

+295
-298
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@
416416
'manager_view' => 'Manager View',
417417
'manager_view_enabled_text' => 'Enable Manager View',
418418
'manager_view_enabled_help' => 'Allow managers to view assigned items to their direct and indirect reports in their account view.',
419+
'redirect_url' => 'Redirect URL',
420+
'client_secret' => 'Client Secret',
421+
'client_id' => 'Client ID',
419422

420423
'username_formats' => [
421424
'username_format' => 'Username Format',

‎resources/views/partials/forms/edit/uploadLogo.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!-- {{ $logoVariable }}logo image upload -->
22

33
<div class="form-group">
4-
<div class="col-md-3 text-right">
5-
<label {!! $errors->has($logoVariable) ? 'class="alert-msg"' : '' !!} for="{{ $logoVariable }}">
4+
<div class="col-md-3 control-label{!! $errors->has($logoVariable) ? ' error' : '' !!}">
5+
<strong>
66
{{ trans($logoLabel) }}
7-
</label>
7+
</strong>
88
</div>
99
<div class="col-md-9">
1010
<label class="btn btn-default{{ (config('app.lock_passwords')) ? ' disabled' : '' }}">

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

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
<div class="col-md-12">
4242

4343

44-
<fieldset name="remote-login"">
44+
<fieldset name="remote-login">
4545
<x-form-legend>
4646
{{ trans('admin/settings/general.legends.general') }}
4747
</x-form-legend>
4848

4949
<!-- Menu Alerts Enabled -->
50-
<div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
50+
<div class="form-group{{ $errors->has('show_alerts_in_menu') ? ' error' : '' }}">
5151
<div class="col-md-9 col-md-offset-3">
5252
<label class="form-control">
5353
<input type="checkbox" name="show_alerts_in_menu" value="1" @checked(old('show_alerts_in_menu', $setting->show_alerts_in_menu))>
@@ -68,16 +68,16 @@
6868

6969
</fieldset>
7070

71-
<fieldset name="alert-addresses"">
71+
<fieldset name="alert-addresses">
7272
<x-form-legend>
7373
{{ trans('admin/settings/general.legends.email') }}
7474
</x-form-legend>
7575

7676
<!-- Alert Email -->
7777
<div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
78-
<div class="col-md-3 text-right">
79-
<label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
80-
</div>
78+
79+
<label for="alert_email" class="col-md-3 control-label">{{ trans('admin/settings/general.alert_email') }}</label>
80+
8181
<div class="col-md-8 input-group">
8282
<input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="[email protected],[email protected]" maxlength="191">
8383
<span class="input-group-addon">
@@ -93,9 +93,8 @@
9393

9494
<!-- Admin CC Email -->
9595
<div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
96-
<div class="col-md-3 text-right">
97-
<label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
98-
</div>
96+
97+
<label for="admin_cc_email" class="col-md-3 control-label">{{ trans('admin/settings/general.admin_cc_email') }}</label>
9998
<div class="col-md-8 input-group">
10099
<input type="email" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="[email protected]" maxlength="191">
101100
<span class="input-group-addon">
@@ -131,17 +130,17 @@
131130
</div>
132131
</fieldset>
133132

134-
<fieldset name="remote-login"">
133+
<fieldset name="remote-login">
135134

136135
<x-form-legend>
137136
{{ trans('admin/settings/general.legends.intervals') }}
138137
</x-form-legend>
139138

140139
<!-- Inventory alert threshold -->
141140
<div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
142-
<div class="col-md-3 text-right">
143-
<label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
144-
</div>
141+
142+
<label for="alert_threshold" class="col-md-3 control-label">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
143+
145144
<div class="col-md-8">
146145
<input class="form-control" placeholder="5" maxlength="3" style="width: 100px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
147146
{!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -151,9 +150,8 @@
151150

152151
<!-- Inventory alert interval -->
153152
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
154-
<div class="col-md-3 text-right">
155-
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
156-
</div>
153+
154+
<label for="alert_interval" class="col-md-3 control-label">{{ trans('admin/settings/general.alert_interval') }}</label>
157155
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
158156
<input class="form-control" placeholder="30" maxlength="3" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
159157
<span class="input-group-addon">{{ trans('general.days') }}</span>
@@ -164,9 +162,8 @@
164162

165163
<!-- Due for checkin days -->
166164
<div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
167-
<div class="col-md-3 text-right">
168-
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
169-
</div>
165+
166+
<label for="due_checkin_days" class="col-md-3 control-label">{{ trans('admin/settings/general.due_checkin_days') }}</label>
170167
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
171168
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
172169
<span class="input-group-addon">{{ trans('general.days') }}</span>
@@ -179,9 +176,8 @@
179176

180177
<!-- Alert warning threshold -->
181178
<div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
182-
<div class="col-md-3 text-right">
183-
<label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
184-
</div>
179+
180+
<label for="audit_warning_days" class="col-md-3 control-label">{{ trans('admin/settings/general.audit_warning_days') }}</label>
185181
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
186182
<input class="form-control" placeholder="14" maxlength="3" min="0" name="audit_warning_days" type="number" id="audit_warning_days" value="{{ old('audit_warning_days', $setting->audit_warning_days) }}">
187183
<span class="input-group-addon">{{ trans('general.days') }}</span>
@@ -194,9 +190,9 @@
194190

195191
<!-- Audit interval -->
196192
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
197-
<div class="col-md-3 text-right">
198-
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
199-
</div>
193+
194+
<label for="audit_interval" class="col-md-3 control-label">{{ trans('admin/settings/general.audit_interval') }}</label>
195+
200196
<div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
201197
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
202198
<span class="input-group-addon">{{ trans('general.months') }}</span>

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

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,50 +42,47 @@
4242

4343
<!-- auto ids -->
4444
<div class="form-group">
45-
<div class="col-md-5">
46-
<strong>{{ trans('admin/settings/general.auto_increment_assets') }}</strong>
47-
</div>
48-
<div class="col-md-7">
45+
<div class="col-md-8 col-md-offset-3">
4946
<label class="form-control">
5047
<input type="checkbox" name="auto_increment_assets" value="1" @checked(old('auto_increment_assets', $setting->auto_increment_assets)) aria-label="auto_increment_assets">
51-
{{ trans('admin/settings/general.enabled') }}
48+
{{ trans('admin/settings/general.auto_increment_assets') }}
5249
</label>
5350
</div>
5451
</div>
5552

5653
<div class="form-group">
57-
<div class="col-md-5">
58-
<label for="next_auto_tag_base">{{ trans('admin/settings/general.next_auto_tag_base') }}</label>
59-
</div>
60-
<div class="col-md-7">
61-
<input class="form-control" style="width: 150px;" aria-label="next_auto_tag_base" name="next_auto_tag_base" type="text" value="{{ old('next_auto_tag_base', $setting->next_auto_tag_base) }}" id="next_auto_tag_base">
54+
55+
<label for="next_auto_tag_base" class="col-md-3 control-label">{{ trans('admin/settings/general.next_auto_tag_base') }}</label>
56+
57+
<div class="col-md-8">
58+
<input class="form-control" style="width: 200px;" aria-label="next_auto_tag_base" name="next_auto_tag_base" type="text" value="{{ old('next_auto_tag_base', $setting->next_auto_tag_base) }}" id="next_auto_tag_base">
6259
{!! $errors->first('next_auto_tag_base', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
6360
</div>
6461
</div>
6562

6663

6764
<!-- auto prefix -->
6865
<div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
69-
<div class="col-md-5">
70-
<label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
71-
</div>
72-
<div class="col-md-7">
66+
67+
<label for="auto_increment_prefix" class="col-md-3 control-label">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
68+
69+
<div class="col-md-8">
7370
@if ($setting->auto_increment_assets == 1)
74-
<input class="form-control" style="width: 150px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
71+
<input class="form-control" maxlength="100" style="width: 200px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
7572
{!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
7673
@else
77-
<input class="form-control" disabled="disabled" style="width: 150px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
74+
<input class="form-control" maxlength="100" disabled="disabled" style="width: 200px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
7875
@endif
7976
</div>
8077
</div>
8178

8279
<!-- auto zerofill -->
8380
<div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}">
84-
<div class="col-md-5">
85-
<label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
86-
</div>
81+
82+
<label for="zerofill_count" class="col-md-3 control-label">{{ trans('admin/settings/general.zerofill_count') }}</label>
83+
8784
<div class="col-md-7">
88-
<input class="form-control" style="width: 150px;" aria-label="zerofill_count" name="zerofill_count" type="text" value="{{ old('zerofill_count', $setting->zerofill_count) }}" id="zerofill_count">
85+
<input class="form-control" maxlength="100" style="width: 200px;" aria-label="zerofill_count" name="zerofill_count" type="text" value="{{ old('zerofill_count', $setting->zerofill_count) }}" id="zerofill_count">
8986
{!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
9087
</div>
9188
</div>

0 commit comments

Comments
 (0)