DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Tweaked slack test UI

Browse source
This commit is contained in:
snipe 2018-02-22 21:47:36 -08:00
parent f7dbda4ed3
commit bfb11d249e
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lang/en/admin/settings/general.php
View file

@ -105,7 +105,8 @@ return array(
'slack_channel' => 'Slack Channel', 'slack_channel' => 'Slack Channel',
'slack_endpoint' => 'Slack Endpoint', 'slack_endpoint' => 'Slack Endpoint',
'slack_integration' => 'Slack Settings', '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.', 'slack_test_help' => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
'snipe_version' => 'Snipe-IT version', 'snipe_version' => 'Snipe-IT version',
'support_footer' => 'Support Footer Links ', 'support_footer' => 'Support Footer Links ',

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

@ -40,8 +40,11 @@
<p style="border-bottom: 0px;"> <p style="border-bottom: 0px;">
{!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!} {!! 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;"> <div class="col-md-11 col-md-offset-1" style="border-top: 0px;">
@ -98,7 +101,7 @@
{{ Form::label('est_slack', 'Test Slack') }} {{ Form::label('est_slack', 'Test Slack') }}
</div> </div>
<div class="col-md-9" id="slacktestrow"> <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>
<div class="col-md-9 col-md-offset-3"> <div class="col-md-9 col-md-offset-3">
<span id="slacktesticon"></span> <span id="slacktesticon"></span>