From 2d0bd2b2929553839465ccf1a6d05688f3715a4a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Feb 2023 14:06:40 -0800 Subject: [PATCH 1/4] Make spinner actually spin Signed-off-by: snipe --- resources/views/livewire/slack-settings-form.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index c165118cbd..4cb02bf21f 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -82,7 +82,7 @@
{!! trans('admin/settings/general.slack_test') !!} -
+
@endif From 27e5832a28395403a71916173ca6fc09843cf81f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Feb 2023 14:06:52 -0800 Subject: [PATCH 2/4] Use existing slack translations Signed-off-by: snipe --- app/Http/Livewire/SlackSettingsForm.php | 4 ++-- resources/lang/en/admin/settings/message.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php index 8e3e148f3d..5c35454a70 100644 --- a/app/Http/Livewire/SlackSettingsForm.php +++ b/app/Http/Livewire/SlackSettingsForm.php @@ -60,11 +60,11 @@ class SlackSettingsForm extends Component return session()->flash('success' , 'Your Slack Integration works!'); } catch (\Exception $e) { - return session()->flash('error' , 'Please check the channel name and webhook endpoint URL ('.e($this->slack_endpoint).'). Slack responded with: '.$e->getMessage()); + return session()->flash('error' , trans('admin/settings/message.slack.error', ['error_message' => $e->getMessage()])); } //} - return session()->flash('message' , 'Something went wrong :( '); + return session()->flash('message' , trans('admin/settings/message.slack.error_misc')); diff --git a/resources/lang/en/admin/settings/message.php b/resources/lang/en/admin/settings/message.php index 174a15fbd9..b0648d1c1c 100644 --- a/resources/lang/en/admin/settings/message.php +++ b/resources/lang/en/admin/settings/message.php @@ -38,6 +38,7 @@ return [ 'success_pt1' => 'Success! Check the ', 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.', '500' => '500 Server Error.', - 'error' => 'Something went wrong.', + 'error' => 'Something went wrong. Slack responded with: :error_message', + 'error_misc' => 'Something went wrong. :( ', ] ]; From 6c3ffa791822d7cf5eaf1be7826c69dd2fac765f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Feb 2023 14:39:24 -0800 Subject: [PATCH 3/4] Removed unused CSS Signed-off-by: snipe --- resources/views/settings/slack.blade.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php index fffe4383c3..a5cbd8d0b3 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -14,11 +14,6 @@ {{-- Page content --}} @section('content') -
@@ -30,10 +25,12 @@
- -

- {!! 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')) !!} +

+
+
@livewire('slack-settings-form') From d4634e83c9bb0b67f66843e4299697a74f37338b Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Feb 2023 14:45:18 -0800 Subject: [PATCH 4/4] Nicer padding, removed unused ids Signed-off-by: snipe --- .../livewire/slack-settings-form.blade.php | 70 +++++++++---------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 4cb02bf21f..ca4ccc527d 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -2,73 +2,75 @@
@if (session()->has('save')) -
+
{{session('save')}}
@endif - @if(session()->has('success')) -
- {{session('success')}} -
- @endif - @if(session()->has('error')) -
- {{session('error')}} -
- @endif - @if(session()->has('message')) -
- {{session('message')}} -
- @endif -
+ + @if(session()->has('success')) +
+ {{session('success')}} +
+ @endif + @if(session()->has('error')) +
+ {{session('error')}} +
+ @endif + @if(session()->has('message')) +
+ {{session('message')}} +
+ @endif + + {{csrf_field()}} -
+
{{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
-
+
@if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

-
+ @else -
+ @endif {!! $errors->first('slack_endpoint', '') !!}
-
+
{{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
-
+
@if (config('app.lock_passwords')===true) -
+

{{ trans('general.feature_disabled') }}

@else -
+ @endif {!! $errors->first('slack_channel', '') !!}
-
+
{{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
-
+
@if (config('app.lock_passwords')===true) -
+

{{ trans('general.feature_disabled') }}

@else -
+ @endif {!! $errors->first('slack_botname', '') !!}
@@ -77,21 +79,17 @@ @if($slack_endpoint != null && $slack_channel != null && $slack_botname != null)
-
- {{ Form::label('test_slack', 'Test Slack') }} -
-
- {!! trans('admin/settings/general.slack_test') !!} +
+ {!! trans('admin/settings/general.slack_test') !!}
@endif
-
{{ trans('button.cancel') }} - +