From 160fd1c86ae3f68555c34cb94e8d453d00a6ed84 Mon Sep 17 00:00:00 2001
From: snipe {{ trans('mail.i_have_read') }} {{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }} {{ trans('mail.i_have_read') }} {{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }} {{ $snipeSettings->site_name }}
{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif @stop diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php index 901b2606b..c5ece1311 100644 --- a/resources/views/emails/asset-requested.blade.php +++ b/resources/views/emails/asset-requested.blade.php @@ -11,5 +11,10 @@ {{ trans('mail.quantity') }} {{ $item_quantity}} @endif -{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif + @stop diff --git a/resources/views/emails/checkin-asset.blade.php b/resources/views/emails/checkin-asset.blade.php index 6358daffd..2dba781e7 100644 --- a/resources/views/emails/checkin-asset.blade.php +++ b/resources/views/emails/checkin-asset.blade.php @@ -75,5 +75,10 @@ @endif -{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif + @stop diff --git a/resources/views/emails/expiring-assets-report.blade.php b/resources/views/emails/expiring-assets-report.blade.php index d4006b76a..ae36b143a 100644 --- a/resources/views/emails/expiring-assets-report.blade.php +++ b/resources/views/emails/expiring-assets-report.blade.php @@ -17,5 +17,10 @@ {!! $email_content !!} -{{ $snipeSettings->site_name }}
+ @if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+ @else +{{ $snipeSettings->site_name }}
+ @endif + @stop diff --git a/resources/views/emails/expiring-licenses-report.blade.php b/resources/views/emails/expiring-licenses-report.blade.php index b032d7c35..bb5373e76 100755 --- a/resources/views/emails/expiring-licenses-report.blade.php +++ b/resources/views/emails/expiring-licenses-report.blade.php @@ -14,5 +14,10 @@ {!! $email_content !!} -{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif + @stop diff --git a/resources/views/emails/forgot-password.blade.php b/resources/views/emails/forgot-password.blade.php index 5ab341881..363cd9fe7 100755 --- a/resources/views/emails/forgot-password.blade.php +++ b/resources/views/emails/forgot-password.blade.php @@ -9,5 +9,9 @@{{ trans('mail.best_regards') }}
-{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif @stop diff --git a/resources/views/emails/low-inventory.blade.php b/resources/views/emails/low-inventory.blade.php index e7f2191fe..552f0ebd1 100644 --- a/resources/views/emails/low-inventory.blade.php +++ b/resources/views/emails/low-inventory.blade.php @@ -27,6 +27,10 @@ -{{ $snipeSettings->site_name }}
+ @if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+ @else +{{ $snipeSettings->site_name }}
+ @endif @stop diff --git a/resources/views/emails/register-activate.blade.php b/resources/views/emails/register-activate.blade.php index cc0b5d8fc..b8d072cfb 100755 --- a/resources/views/emails/register-activate.blade.php +++ b/resources/views/emails/register-activate.blade.php @@ -9,5 +9,9 @@{{ trans('mail.best_regards') }}
-{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif @stop diff --git a/resources/views/emails/send-login.blade.php b/resources/views/emails/send-login.blade.php index 4f728dec1..24c45cd71 100644 --- a/resources/views/emails/send-login.blade.php +++ b/resources/views/emails/send-login.blade.php @@ -12,5 +12,10 @@{{ trans('mail.best_regards') }}
-{{ $snipeSettings->site_name }}
+@if ($snipeSettings->show_url_in_emails=='1') +{{ $snipeSettings->site_name }}
+@else +{{ $snipeSettings->site_name }}
+@endif + @stop diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 5365c091a..3405247c9 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -86,6 +86,17 @@ {!! $errors->first('brand', ':message') !!} + +{{ trans('admin/settings/general.show_url_in_emails_help_text') }}
+