mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
316ee6f810
|
@ -14,40 +14,28 @@
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- Show images in email! --}}
|
{{-- Show images in email! --}}
|
||||||
@if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
|
@if (($snipeSettings->show_images_in_email=='1') && ($snipeSettings->email_logo!='') && $snipeSettings->brand != '1'))
|
||||||
|
|
||||||
{{-- $snipeSettings->brand = 1 = Text --}}
|
{{-- $snipeSettings->brand = 1 = Text --}}
|
||||||
{{-- $snipeSettings->brand = 2 = Logo --}}
|
{{-- $snipeSettings->brand = 2 = Logo --}}
|
||||||
{{-- $snipeSettings->brand = 3 = Logo + Text --}}
|
{{-- $snipeSettings->brand = 3 = Logo + Text --}}
|
||||||
@if ($snipeSettings->brand == '3')
|
@if ($snipeSettings->brand == '3')
|
||||||
|
|
||||||
@if ($snipeSettings->email_logo!='')
|
|
||||||
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
|
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
|
||||||
@elseif ($snipeSettings->logo!='')
|
|
||||||
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<br><br>
|
<br><br>
|
||||||
{{ $snipeSettings->site_name }}
|
{{ $snipeSettings->site_name }}
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
{{-- else if branding type is just logo --}}
|
{{-- else if branding type is just logo --}}
|
||||||
@elseif ($snipeSettings->brand == '2')
|
@elseif ($snipeSettings->brand == '2')
|
||||||
@if ($snipeSettings->email_logo!='')
|
<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
|
||||||
|
|
||||||
<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
|
|
||||||
@elseif ($snipeSettings->logo!='')
|
|
||||||
<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
|
|
||||||
@endif
|
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@else
|
@else
|
||||||
{{ $snipeSettings->site_name }}
|
{{ $snipeSettings->site_name ?? config('app.name') }}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{-- Either the $snipeSettings variable isn't set or setup is not complete --}}
|
|
||||||
@else
|
|
||||||
{{ config('app.name') }}
|
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@endcomponent
|
@endcomponent
|
||||||
@endslot
|
@endslot
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue