lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2833 from CachetHQ/use-setting-app-name

Browse Source 
Use settings.app_name and app.name for fallback
This commit is contained in:
James Brooks
2018-01-21 20:57:54 +00:00
committed by GitHub
parent 27d59ccf52 2343a10c94
commit edd10ab171
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/vendor/mail/html/message.blade.php vendored
View File

@@ -2,7 +2,7 @@
{{-- Header --}} {{-- Header --}}
@slot('header') @slot('header')
@component('mail::header', ['url' => config('app.url')]) @component('mail::header', ['url' => config('app.url')])
{{ config('app.name') }} {{ setting('app_name', config('app.name')) }}
@endcomponent @endcomponent
@endslot @endslot
@@ -21,7 +21,7 @@
{{-- Footer --}} {{-- Footer --}}
@slot('footer') @slot('footer')
@component('mail::footer') @component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. All rights reserved. © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. All rights reserved.
@endcomponent @endcomponent
@endslot @endslot
@endcomponent @endcomponent

4
resources/views/vendor/mail/markdown/message.blade.php vendored
View File

@@ -2,7 +2,7 @@
{{-- Header --}} {{-- Header --}}
@slot('header') @slot('header')
@component('mail::header', ['url' => config('app.url')]) @component('mail::header', ['url' => config('app.url')])
{{ config('app.name') }} {{ setting('app_name', config('app.name')) }}
@endcomponent @endcomponent
@endslot @endslot
@@ -21,7 +21,7 @@
{{-- Footer --}} {{-- Footer --}}
@slot('footer') @slot('footer')
@component('mail::footer') @component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. All rights reserved. © {{ date('Y') }} {{ setting('app_name', config('app.name')) }}. All rights reserved.
@endcomponent @endcomponent
@endslot @endslot
@endcomponent @endcomponent

6
resources/views/vendor/notifications/email.blade.php vendored
View File

@@ -71,7 +71,7 @@ $style = [
<tr> <tr>
<td style="{{ $style['email-masthead'] }}"> <td style="{{ $style['email-masthead'] }}">
<a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank"> <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
{{ setting('app_name') }} {{ setting('app_name', config('app.name')) }}
</a> </a>
</td> </td>
</tr> </tr>
@@ -140,7 +140,7 @@ $style = [
<!-- Salutation --> <!-- Salutation -->
<p style="{{ $style['paragraph'] }}"> <p style="{{ $style['paragraph'] }}">
Regards,<br>{{ setting('app_name') }} Regards,<br>{{ {{ setting('app_name', config('app.name')) }} }}
</p> </p>
<!-- Sub Copy --> <!-- Sub Copy -->
@@ -176,7 +176,7 @@ $style = [
<td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}"> <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
<p style="{{ $style['paragraph-sub'] }}"> <p style="{{ $style['paragraph-sub'] }}">
&copy; {{ date('Y') }} &copy; {{ date('Y') }}
<a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ setting('app_name') }}</a>. <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ {{ setting('app_name', config('app.name')) }} }}</a>.
All rights reserved. All rights reserved.
</p> </p>
</td> </td>