diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index da5e3e95..2f1d14ef 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -31,6 +31,8 @@ class AppComposer $mailFrom = env('MAIL_NAME', false); $view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom); + $view->withAppName(Setting::get('app_name')); $view->withAboutApp(Markdown::convertToHtml(Setting::get('app_about'))); + $view->withShowSupport(Setting::get('show_support')); } } diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 2734a561..456cd038 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -21,7 +21,7 @@
- +
@@ -38,7 +38,7 @@
- +
@@ -78,7 +78,7 @@
diff --git a/resources/views/emails/incidents/maintenance-html.blade.php b/resources/views/emails/incidents/maintenance-html.blade.php index b7d7442f..b734a634 100644 --- a/resources/views/emails/incidents/maintenance-html.blade.php +++ b/resources/views/emails/incidents/maintenance-html.blade.php @@ -1,11 +1,11 @@ @extends('layout.emails') @section('preheader') -{!! trans('cachet.subscriber.email.maintenance.html-preheader', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.subscriber.email.maintenance.html-preheader', ['app_name' => $app_name]) !!} @stop @section('content') - {!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => Setting::get('app_name')]) !!} + {!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => $app_name]) !!}

{{ $scheduled_at }}

@@ -17,8 +17,8 @@ {!! $html_content !!}

- @if(Setting::get('show_support')) -

{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}

+ @if($show_support) +

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

@endif

{!! trans('cachet.subscriber.email.unsubscribe') !!} diff --git a/resources/views/emails/incidents/maintenance-text.blade.php b/resources/views/emails/incidents/maintenance-text.blade.php index 6297f660..ea0346a3 100644 --- a/resources/views/emails/incidents/maintenance-text.blade.php +++ b/resources/views/emails/incidents/maintenance-text.blade.php @@ -1,4 +1,4 @@ -{!! trans('cachet.subscriber.email.maintenance.text', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.subscriber.email.maintenance.text', ['app_name' => $app_name]) !!} {{ $scheduled_at }} @@ -6,8 +6,8 @@ {!! $text_content !!} -@if(Setting::get('show_support')) -{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!} +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} @endif {!! trans('cachet.subscriber.email.unsubscribe') !!} {{ $unsubscribe_link }} diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php index b588046c..60d8583c 100644 --- a/resources/views/emails/incidents/new-html.blade.php +++ b/resources/views/emails/incidents/new-html.blade.php @@ -1,11 +1,11 @@ @extends('layout.emails') @section('preheader') -{!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!} @stop @section('content') - {!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => Setting::get('app_name')]) !!} + {!! trans('cachet.subscriber.email.incident.html-preheader', ['app_name' => $app_name]) !!}

{!! $status !!} @@ -18,8 +18,8 @@ {!! $html_content !!}

- @if(Setting::get('show_support')) -

{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}

+ @if($show_support) +

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

@endif

{!! trans('cachet.subscriber.email.unsubscribe') !!} diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php index 1bb58869..3386519d 100644 --- a/resources/views/emails/incidents/new-text.blade.php +++ b/resources/views/emails/incidents/new-text.blade.php @@ -1,4 +1,4 @@ -{!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.subscriber.email.incident.text', ['app_name' => $app_name]) !!} {!! $status !!} @if($has_component) @@ -7,8 +7,8 @@ {!! $text_content !!} -@if(Setting::get('show_support')) -{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!} +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} @endif {!! trans('cachet.subscriber.email.unsuscribe') !!} {{ $unsubscribe_link }} diff --git a/resources/views/emails/subscribers/verify-html.blade.php b/resources/views/emails/subscribers/verify-html.blade.php index 3575107a..e501fd82 100644 --- a/resources/views/emails/subscribers/verify-html.blade.php +++ b/resources/views/emails/subscribers/verify-html.blade.php @@ -1,13 +1,13 @@ @extends('layout.emails') @section('preheader') -{!! trans('cachet.subscriber.email.verify.html-preheader', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.subscriber.email.verify.html-preheader', ['app_name' => $app_name]) !!} @stop @section('content') - {!! trans('cachet.subscriber.email.verify.html', ['app_name' => Setting::get('app_name'), 'link' => $link]) !!} + {!! trans('cachet.subscriber.email.verify.html', ['app_name' => $app_name, 'link' => $link]) !!} - @if(Setting::get('show_support')) -

{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}

+ @if($show_support) +

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

@endif @stop diff --git a/resources/views/emails/subscribers/verify-text.blade.php b/resources/views/emails/subscribers/verify-text.blade.php index 7aca9f75..b45eb8a6 100644 --- a/resources/views/emails/subscribers/verify-text.blade.php +++ b/resources/views/emails/subscribers/verify-text.blade.php @@ -1,5 +1,5 @@ -{{ trans('cachet.subscriber.email.verify.text', ['app_name' => Setting::get('app_name'), 'link' => $link]) }} +{{ trans('cachet.subscriber.email.verify.text', ['app_name' => $app_name, 'link' => $link]) }} -@if(Setting::get('show_support')) -{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!} +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} @endif diff --git a/resources/views/emails/users/invite-html.blade.php b/resources/views/emails/users/invite-html.blade.php index 5b429e6d..3c5e6e0c 100644 --- a/resources/views/emails/users/invite-html.blade.php +++ b/resources/views/emails/users/invite-html.blade.php @@ -1,13 +1,13 @@ @extends('layout.emails') @section('preheader') -{!! trans('cachet.users.email.invite.html-preheader', ['app_name' => Setting::get('app_name')]) !!} +{!! trans('cachet.users.email.invite.html-preheader', ['app_name' => $app_name]) !!} @stop @section('content') - {!! trans('cachet.users.email.invite.html', ['app_name' => Setting::get('app_name'), 'link' => $link]) !!} + {!! trans('cachet.users.email.invite.html', ['app_name' => $app_name, 'link' => $link]) !!} - @if(Setting::get('show_support')) -

{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}

+ @if($show_support) +

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

@endif @stop diff --git a/resources/views/emails/users/invite-text.blade.php b/resources/views/emails/users/invite-text.blade.php index 04a4b68c..2195b31a 100644 --- a/resources/views/emails/users/invite-text.blade.php +++ b/resources/views/emails/users/invite-text.blade.php @@ -1,5 +1,5 @@ -{{ trans('cachet.users.email.invite.text', ['app_name' => Setting::get('app_name'), 'link' => $link]) }} +{{ trans('cachet.users.email.invite.text', ['app_name' => $app_name, 'link' => $link]) }} -@if(Setting::get('show_support')) -{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!} +@if($show_support) +{!! trans('cachet.powered_by', ['app' => $app_name]) !!} @endif diff --git a/resources/views/layout/emails.blade.php b/resources/views/layout/emails.blade.php index 68c097c3..04a6901c 100644 --- a/resources/views/layout/emails.blade.php +++ b/resources/views/layout/emails.blade.php @@ -5,7 +5,7 @@ -{{ Setting::get('app_name') }} +{{ $app_name }} @include('partials.email-css') @@ -32,7 +32,7 @@ - {{ Setting::get('app_name') }} + {{ $app_name }} diff --git a/resources/views/layout/error.blade.php b/resources/views/layout/error.blade.php index 21a7ef2c..2eba0e3d 100644 --- a/resources/views/layout/error.blade.php +++ b/resources/views/layout/error.blade.php @@ -4,8 +4,8 @@ - - + + @@ -19,7 +19,7 @@ - {{ isset($page_title) ?: Setting::get('app_name') }} + {{ isset($page_title) ?: $app_name }} diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php index f14552f6..3cbbded2 100644 --- a/resources/views/partials/footer.blade.php +++ b/resources/views/partials/footer.blade.php @@ -2,8 +2,8 @@
- @if(Setting::get('show_support')) -

{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}

+ @if($show_support) +

{!! trans('cachet.powered_by', ['app' => $app_name]) !!}

@endif