Merge pull request #3100 from CachetHQ/fix-mail-markdown-notifications

Fix mail markdown notifications

resources/lang/en/cachet.php

@@ -75,10 +75,11 @@ return [
 
     // Subscriber
     'subscriber' => [
-        'subscribe'   => 'Subscribe to get the updates',
-        'unsubscribe' => 'Unsubscribe at :link',
-        'button'      => 'Subscribe',
-        'manage'      => [
+        'subscribe'           => 'Subscribe to get the updates',
+        'unsubscribe'         => 'Unsubscribe',
+        'button'              => 'Subscribe',
+        'manage_subscription' => 'Manage subscription',
+        'manage'              => [
             'no_subscriptions' => 'You\'re currently subscribed to all updates.',
             'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
             'manage_at_link'   => 'Manage your subscriptions at :link',

resources/views/notifications/incident/new.blade.php

@@ -0,0 +1,15 @@
+@component('mail::message')
+# {{ trans('notifications.incident.new.mail.greeting', ['app_name' => Config::get('setting.app_name')]) }}
+
+{{ $incident->message }}
+
+@component('mail::button', ['url' => $actionUrl])
+{{ $actionText }}
+@endcomponent
+
+Thanks,<br>
+{{ Config::get('setting.app_name') }}
+
+@include('notifications.partials.subscription')
+
+@endcomponent

resources/views/notifications/partials/subscription.blade.php

@@ -0,0 +1,3 @@
+@component('mail::subcopy')
+[{{ $unsubscribeText }}]({{ $unsubscribeUrl }}) — [{{ $manageSubscriptionText }}]({{ $manageSubscriptionUrl }})
+@endcomponent