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

UI tweaks and updated JS to disable the save button if the settings are not correct

Browse source
This commit is contained in:
snipe 2020-09-15 23:14:10 -07:00
parent 3ceff29e04
commit 74b96a7413
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
resources/views/settings/slack.blade.php
View file

@ -47,19 +47,19 @@
</p> </p>
<div class="col-md-11 col-md-offset-1" style="border-top: 0px;"> <div class="col-md-12" style="border-top: 0px;">
<!-- slack endpoint --> <!-- slack endpoint -->
<div class="form-group {{ $errors->has('slack_endpoint') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('slack_endpoint') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-2">
{{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }} {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
</div> </div>
<div class="col-md-8"> <div class="col-md-10">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }} {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
@else @else
{{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX')) }} {{ Form::text('slack_endpoint', Request::old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
@endif @endif
{!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>
@ -67,10 +67,10 @@
<!-- slack channel --> <!-- slack channel -->
<div class="form-group {{ $errors->has('slack_channel') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('slack_channel') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-2">
{{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }} {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
</div> </div>
<div class="col-md-8"> <div class="col-md-10">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{{ Form::text('slack_channel', Request::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }} {{ Form::text('slack_channel', Request::old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
@else @else
@ -82,10 +82,10 @@
<!-- slack botname --> <!-- slack botname -->
<div class="form-group {{ $errors->has('slack_botname') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('slack_botname') ? 'error' : '' }}">
<div class="col-md-3"> <div class="col-md-2">
{{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }} {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
</div> </div>
<div class="col-md-8"> <div class="col-md-10">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{{ Form::text('slack_botname', Request::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }} {{ Form::text('slack_botname', Request::old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
@else @else
@ -97,20 +97,18 @@
@if (($setting->slack_channel!='') && ($setting->slack_endpoint)) @if (($setting->slack_channel!='') && ($setting->slack_endpoint))
<div class="form-group"> <div class="form-group">
<div class="col-md-3"> <div class="col-md-2">
{{ Form::label('est_slack', 'Test Slack') }} {{ Form::label('test_slack', 'Test Slack') }}
</div> </div>
<div class="col-md-8" id="slacktestrow"> <div class="col-md-10" id="slacktestrow">
<a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test <i class="fa fa-slack"></i> Integration</a> <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test <i class="fa fa-slack"></i> Integration</a>
</div> </div>
<div class="col-md-8 col-md-offset-3"> <div class="col-md-10 col-md-offset-2">
<span id="slacktesticon"></span> <span id="slacktesticon"></span>
<span id="slacktestresult"></span> <span id="slacktestresult"></span>
<span id="slackteststatus"></span> <span id="slackteststatus"></span>
</div> </div>
<div class="col-md-9 col-md-offset-3">
<p class="help-block">{{ trans('admin/settings/general.slack_test_help') }}</p>
</div>
</div> </div>
@endif @endif
@ -121,7 +119,7 @@
<a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a> <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
</div> </div>
<div class="text-right col-md-6"> <div class="text-right col-md-6">
<button type="submit" class="btn btn-primary"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button> <button type="submit" id="save_slack" class="btn btn-primary" disabled><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
</div> </div>
</div> </div>
@ -133,9 +131,15 @@
@stop @stop
@section('moar_scripts') @push('js')
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
$("#slacktest").click(function() { $("#slacktest").click(function() {
$("slack_channel").click(function(){
$("input:text").val("Glenn Quagmire");
});
$("#slacktestrow").removeClass('text-success'); $("#slacktestrow").removeClass('text-success');
$("#slacktestrow").removeClass('text-danger'); $("#slacktestrow").removeClass('text-danger');
$("#slackteststatus").removeClass('text-danger'); $("#slackteststatus").removeClass('text-danger');
@ -149,21 +153,25 @@
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content') "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
}, },
data: { data: {
'ldaptest_user': $('#ldaptest_user').val(), 'slack_endpoint': $('#slack_endpoint').val(),
'ldaptest_password': $('#ldaptest_password').val() 'slack_channel': $('#slack_channel').val(),
'slack_botname': $('#slack_botname').val(),
}, },
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
$('#save_slack').removeAttr('disabled');
$("#slacktesticon").html(''); $("#slacktesticon").html('');
$("#slacktestrow").addClass('text-success'); $("#slacktestrow").addClass('text-success');
$("#slackteststatus").addClass('text-success'); $("#slackteststatus").addClass('text-success');
$("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the {{ $setting->slack_channel}} channel for your test message'); $("#slackteststatus").html('<i class="fa fa-check text-success"></i> Success! Check the ' + $('#slack_channel').val() + ' channel for your test message, and be sure to click SAVE below to store your settings.');
}, },
error: function (data) { error: function (data) {
if (data.responseJSON) { if (data.responseJSON) {
var errors = data.responseJSON.message; var errors = data.responseJSON.message;
} else { } else {
@ -172,6 +180,7 @@
var error_text = ''; var error_text = '';
$('#save_slack').attr("disabled", true);
$("#slacktesticon").html(''); $("#slacktesticon").html('');
$("#slackteststatus").addClass('text-danger'); $("#slackteststatus").addClass('text-danger');
$("#slacktesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>'); $("#slacktesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
@ -206,4 +215,4 @@
</script> </script>
@stop @endpush