- {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id')) }}
+ {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'placeholder' => trans('general.select_statuslabel'))) }}
{!! $errors->first('status_id', ' :message') !!}
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 4a7170459..f23a1b146 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -20,7 +20,7 @@
}
- {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+ {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'create-form' ]) }}
{{csrf_field()}}
@@ -45,12 +45,12 @@
{{ Form::label('site_name', trans('admin/settings/general.site_name')) }}
-
+
@if (config('app.lock_passwords')===true)
{{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Snipe-IT Asset Management')) }}
@else
{{ Form::text('site_name',
- Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
+ Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'data-validation' => 'required')) }}
@endif
{!! $errors->first('site_name', ':message') !!}
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index af93a7c8e..db7dc49ec 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -292,7 +292,7 @@
'default' => 'Linear (default)',
'half_1' => 'Half-year convention, always applied',
'half_2' => 'Half-year convention, applied with condition',
- ), Input::old('username_format', $setting->depreciation_method)) }}
+ ), Input::old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 1fa20def0..a726e71e0 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -38,7 +38,7 @@
-
+
{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
@if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))
@@ -55,7 +55,7 @@
{{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
-
+
@if (config('app.lock_passwords')===true)
{{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
@else
@@ -70,7 +70,7 @@
{{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
-
+
@if (config('app.lock_passwords')===true)
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
@else
@@ -85,7 +85,7 @@
{{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
-
+
@if (config('app.lock_passwords')===true)
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
@else
@@ -100,10 +100,10 @@
{{ Form::label('est_slack', 'Test Slack') }}
-