mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Tweaked slack test UI
This commit is contained in:
parent
f7dbda4ed3
commit
bfb11d249e
|
@ -105,7 +105,8 @@ return array(
|
|||
'slack_channel' => 'Slack Channel',
|
||||
'slack_endpoint' => 'Slack Endpoint',
|
||||
'slack_integration' => 'Slack Settings',
|
||||
'slack_integration_help' => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new">create an incoming webhook</a> on your Slack account. Once you have saved your Slack information, a test button will appear.',
|
||||
'slack_integration_help' => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new" rel="noopener">create an incoming webhook</a> on your Slack account. ',
|
||||
'slack_integration_help_button' => 'Once you have saved your Slack information, a test button will appear.',
|
||||
'slack_test_help' => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
|
||||
'snipe_version' => 'Snipe-IT version',
|
||||
'support_footer' => 'Support Footer Links ',
|
||||
|
|
|
@ -40,8 +40,11 @@
|
|||
|
||||
<p style="border-bottom: 0px;">
|
||||
{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
|
||||
</p>
|
||||
|
||||
@if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))
|
||||
{{ trans('admin/settings/general.slack_integration_help_button') }}
|
||||
@endif
|
||||
</p>
|
||||
|
||||
|
||||
<div class="col-md-11 col-md-offset-1" style="border-top: 0px;">
|
||||
|
@ -98,7 +101,7 @@
|
|||
{{ Form::label('est_slack', 'Test Slack') }}
|
||||
</div>
|
||||
<div class="col-md-9" id="slacktestrow">
|
||||
<a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">Test 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 class="col-md-9 col-md-offset-3">
|
||||
<span id="slacktesticon"></span>
|
||||
|
|
Loading…
Reference in a new issue