ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slack field validation and placeholder text

Browse Source
This commit is contained in:
snipe
2015-04-30 16:58:33 -07:00
parent 9f9a9a51b3
commit 62b5ec5b02
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/config/version.php
View File

@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v1.2.6.1-231',
'hash_version' => 'v1.2.6.1-231-g767e2c6',
'app_version' => 'v1.2.7-beta',
'hash_version' => 'v1.2.7-beta',
);

3
app/controllers/admin/SettingsController.php
View File

@@ -70,6 +70,9 @@ class SettingsController extends AdminController
"qr_text" => 'min:1|max:31',
"logo" => 'mimes:jpeg,bmp,png,gif',
"alert_email" => 'email',
"slack_endpoint" => 'url',
"slack_channel" => 'regex:/(?<!\w)#\w+/',
"slack_botname" => 'alpha_dash',
);
if (Config::get('app.lock_passwords')==false) {

24
app/views/backend/settings/edit.blade.php
View File

@@ -53,9 +53,9 @@ padding: 0px 20px;
</div>
<div class="col-md-9">
@if (Config::get('app.lock_passwords')===true)
{{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled')) }}
{{ 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')) }}
{{ Form::text('site_name', Input::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
@endif
@@ -82,7 +82,7 @@ padding: 0px 20px;
{{ Form::label('alert_email', Lang::get('admin/settings/general.alert_email')) }}
</div>
<div class="col-md-9">
{{ Form::text('alert_email', Input::old('alert_email', $setting->alert_email), array('class' => 'form-control')) }}
{{ Form::text('alert_email', Input::old('alert_email', $setting->alert_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }}
{{ Form::checkbox('alerts_enabled', '1', Input::old('alerts_enabled', $setting->alerts_enabled)) }}
@@ -181,10 +181,10 @@ padding: 0px 20px;
</div>
<div class="col-md-9">
@if ($setting->qr_code == 1)
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control')) }}
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control','placeholder' => 'Property of Your Company')) }}
{{ $errors->first('qr_text', '<br><span class="alert-msg">:message</span>') }}
@else
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled')) }}
{{ Form::text('qr_text', Input::old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Property of Your Company')) }}
<p class="help-inline">
@lang('admin/settings/general.qr_help')
</p>
@@ -210,7 +210,7 @@ padding: 0px 20px;
{{ Form::label('default_eula_text', Lang::get('admin/settings/general.default_eula_text')) }}
</div>
<div class="col-md-9">
{{ Form::textarea('default_eula_text', Input::old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control')) }}
{{ Form::textarea('default_eula_text', Input::old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
{{ $errors->first('default_eula_text', '<br><span class="alert-msg">:message</span>') }}
<p class="help-inline">@lang('admin/settings/general.default_eula_help_text')</p>
@@ -231,9 +231,9 @@ padding: 0px 20px;
<div class="col-md-9">
@if (Config::get('app.lock_passwords')===true)
{{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled')) }}
{{ 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
{{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control')) }}
{{ Form::text('slack_endpoint', Input::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }}
@endif
{{ $errors->first('slack_endpoint', '<br><span class="alert-msg">:message</span>') }}
@@ -246,9 +246,9 @@ padding: 0px 20px;
</div>
<div class="col-md-9">
@if (Config::get('app.lock_passwords')===true)
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled')) }}
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
@else
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control')) }}
{{ Form::text('slack_channel', Input::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }}
@endif
{{ $errors->first('slack_channel', '<br><span class="alert-msg">:message</span>') }}
</div>
@@ -260,9 +260,9 @@ padding: 0px 20px;
</div>
<div class="col-md-9">
@if (Config::get('app.lock_passwords')===true)
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled')) }}
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-IT Bot')) }}
@else
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control')) }}
{{ Form::text('slack_botname', Input::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-IT Bot')) }}
@endif
{{ $errors->first('slack_botname', '<br><span class="alert-msg">:message</span>') }}
</div>