From bfb11d249ee465e57f5f3b3e5a587078ec501c53 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 22 Feb 2018 21:47:36 -0800
Subject: [PATCH] Tweaked slack test UI

---
 resources/lang/en/admin/settings/general.php | 3 ++-
 resources/views/settings/slack.blade.php     | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index d544657dff..2539aee7d3 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -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 ',
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 3647934aa3..1fa20def08 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -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>