DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16195 from marcusmoore/chore/migrate-label-helpers-pt5

Browse source 
Replace calls to Form::label pt5
This commit is contained in:
snipe 2025-02-06 10:16:17 +00:00 committed by GitHub
parent d74d9900da a331e14ef2
commit c17598d4b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/settings/asset_tags.blade.php
View file

@ -55,7 +55,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-md-5"> <div class="col-md-5">
{{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }} <label for="next_auto_tag_base">{{ trans('admin/settings/general.next_auto_tag_base') }}</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('next_auto_tag_base', old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }} {{ Form::text('next_auto_tag_base', old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }}
@ -67,7 +67,7 @@
<!-- auto prefix --> <!-- auto prefix -->
<div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
<div class="col-md-5"> <div class="col-md-5">
{{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }} <label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
@if ($setting->auto_increment_assets == 1) @if ($setting->auto_increment_assets == 1)
@ -82,7 +82,7 @@
<!-- auto zerofill --> <!-- auto zerofill -->
<div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}">
<div class="col-md-5"> <div class="col-md-5">
{{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }} <label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
{{ Form::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }} {{ Form::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }}

16
resources/views/settings/branding.blade.php
View file

@ -45,7 +45,7 @@
<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('site_name', trans('admin/settings/general.site_name')) }} <label for="site_name">{{ trans('admin/settings/general.site_name') }}</label>
</div> </div>
<div class="col-md-7 required"> <div class="col-md-7 required">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
@ -64,7 +64,7 @@
<!-- Branding --> <!-- Branding -->
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('brand', trans('admin/settings/general.web_brand')) }} <label for="brand">{{ trans('admin/settings/general.web_brand') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
@ -188,7 +188,7 @@
<!-- Header color --> <!-- Header color -->
<div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('header_color', trans('admin/settings/general.header_color')) }} <label for="header_color">{{ trans('admin/settings/general.header_color') }}</label>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<div class="input-group header-color"> <div class="input-group header-color">
@ -204,7 +204,7 @@
<!-- Skin --> <!-- Skin -->
<div class="form-group {{ $errors->has('skin') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('skin', trans('general.skin')) }} <label for="skin">{{ trans('general.skin') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::skin('skin', old('skin', $setting->skin), 'select2') !!} {!! Form::skin('skin', old('skin', $setting->skin), 'select2') !!}
@ -229,7 +229,7 @@
<!-- Custom css --> <!-- Custom css -->
<div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('custom_css', trans('admin/settings/general.custom_css')) }} <label for="custom_css">{{ trans('admin/settings/general.custom_css') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
@ -248,7 +248,7 @@
<!-- Support Footer --> <!-- Support Footer -->
<div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('support_footer', trans('admin/settings/general.support_footer')) }} <label for="support_footer">{{ trans('admin/settings/general.support_footer') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
@ -267,7 +267,7 @@
<!-- Version Footer --> <!-- Version Footer -->
<div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('version_footer', trans('admin/settings/general.version_footer')) }} <label for="version_footer">{{ trans('admin/settings/general.version_footer') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
@ -285,7 +285,7 @@
<!-- Additional footer --> <!-- Additional footer -->
<div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('footer_text', trans('admin/settings/general.footer_text')) }} <label for="footer_text">{{ trans('admin/settings/general.footer_text') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)

31
resources/views/settings/general.blade.php
View file

@ -77,7 +77,7 @@
<!-- Email domain --> <!-- Email domain -->
<div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('email_domain', trans('general.email_domain')) }} <label for="email_domain">{{ trans('general.email_domain') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('email_domain', old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }} {{ Form::text('email_domain', old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
@ -90,7 +90,7 @@
<!-- Email format --> <!-- Email format -->
<div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('email_format', trans('general.email_format')) }} <label for="email_format">{{ trans('general.email_format') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::username_format('email_format', old('email_format', $setting->email_format), 'select2') !!} {!! Form::username_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
@ -101,7 +101,7 @@
<!-- Username format --> <!-- Username format -->
<div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('username_format', trans('general.username_format')) }} <label for="username_format">{{ trans('general.username_format') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!} {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
@ -182,7 +182,7 @@
<!-- Per Page --> <!-- Per Page -->
<div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('per_page', trans('admin/settings/general.per_page')) }} <label for="per_page">{{ trans('admin/settings/general.per_page') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@ -193,7 +193,7 @@
<!-- Thumb Size --> <!-- Thumb Size -->
<div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('thumbnail_max_h', trans('admin/settings/general.thumbnail_max_h')) }} <label for="thumbnail_max_h">{{ trans('admin/settings/general.thumbnail_max_h') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::text('thumbnail_max_h', old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {{ Form::text('thumbnail_max_h', old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@ -205,7 +205,7 @@
<!-- Default EULA --> <!-- Default EULA -->
<div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }} <label for="default_eula_text">{{ trans('admin/settings/general.default_eula_text') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }} {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
@ -236,7 +236,7 @@
<!-- login text --> <!-- login text -->
<div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('login_note', trans('admin/settings/general.login_note')) }} <label for="login_note">{{ trans('admin/settings/general.login_note') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
@ -255,7 +255,7 @@
<!-- Mail test --> <!-- Mail test -->
<div class="form-group"> <div class="form-group">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('login_note', 'Test Mail') }} <label for="login_note">Test Mail</label>
</div> </div>
<div class="col-md-9" id="mailtestrow"> <div class="col-md-9" id="mailtestrow">
<a class="btn btn-default btn-sm pull-left" id="mailtest" style="margin-right: 10px;"> <a class="btn btn-default btn-sm pull-left" id="mailtest" style="margin-right: 10px;">
@ -278,7 +278,7 @@
<!-- dashboard text --> <!-- dashboard text -->
<div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('dashboard_message', trans('admin/settings/general.dashboard_message')) }} <label for="dashboard_message">{{ trans('admin/settings/general.dashboard_message') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
@ -302,8 +302,7 @@
<!-- Archived in List --> <!-- Archived in List -->
<div class="form-group {{ $errors->has('show_archived_in_list') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('show_archived_in_list') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('show_archived_in_list', <label for="show_archived_in_list">{{ trans('admin/settings/general.show_archived_in_list') }}</label>
trans('admin/settings/general.show_archived_in_list')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@ -318,8 +317,7 @@
<!-- Show assets assigned to user's assets --> <!-- Show assets assigned to user's assets -->
<div class="form-group {{ $errors->has('show_assigned_assets') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('show_assigned_assets') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('show_assigned_assets', <label for="show_assigned_assets">{{ trans('admin/settings/general.show_assigned_assets') }}</label>
trans('admin/settings/general.show_assigned_assets')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<label class="form-control"> <label class="form-control">
@ -355,8 +353,7 @@
<!-- dash chart --> <!-- dash chart -->
<div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('show_in_model_list', <label for="show_in_model_list">{{ trans('general.pie_chart_type') }}</label>
trans('general.pie_chart_type')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::select('dash_chart_type', array( {{ Form::select('dash_chart_type', array(
@ -369,7 +366,7 @@
<!-- Depreciation method --> <!-- Depreciation method -->
<div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('depreciation_method', trans('Depreciation method')) }} <label for="depreciation_method">{{ trans('Depreciation method') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::select('depreciation_method', array( {{ Form::select('depreciation_method', array(
@ -384,7 +381,7 @@
<!-- Privacy Policy Footer--> <!-- Privacy Policy Footer-->
<div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-3">
{{ Form::label('privacy_policy_link', trans('admin/settings/general.privacy_policy_link')) }} <label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))