diff --git a/config/lorekeeper/image_files.php b/config/lorekeeper/image_files.php index f276e2ea70..70b1bc562a 100644 --- a/config/lorekeeper/image_files.php +++ b/config/lorekeeper/image_files.php @@ -60,6 +60,6 @@ 'content_warning' => [ 'name' => 'Content Warning Thumbnail', 'description' => 'Thumbnail used for characters and gallery submissions with a set content warning. PNG format, size of masterlist thumbnails.', - 'filename' => 'content_warning.png', + 'filename' => 'content-warning.png', ], ]; diff --git a/public/images/content_warning.png b/public/images/content_warning.png deleted file mode 100644 index 72d8d8a2f7..0000000000 Binary files a/public/images/content_warning.png and /dev/null differ diff --git a/resources/views/character/_image_info.blade.php b/resources/views/character/_image_info.blade.php index 7a9702e02f..b2611d39e1 100644 --- a/resources/views/character/_image_info.blade.php +++ b/resources/views/character/_image_info.blade.php @@ -8,7 +8,7 @@ - Content Warning + Content Warning
Character Warnings
diff --git a/resources/views/character/bank.blade.php b/resources/views/character/bank.blade.php index 1470b7660d..1483890d29 100644 --- a/resources/views/character/bank.blade.php +++ b/resources/views/character/bank.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/character.blade.php b/resources/views/character/character.blade.php index 5f96a1a948..93ada79744 100644 --- a/resources/views/character/character.blade.php +++ b/resources/views/character/character.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/character_logs.blade.php b/resources/views/character/character_logs.blade.php index 06699287b3..573f15966d 100644 --- a/resources/views/character/character_logs.blade.php +++ b/resources/views/character/character_logs.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/currency_logs.blade.php b/resources/views/character/currency_logs.blade.php index 7ef78e4559..d2e9a24018 100644 --- a/resources/views/character/currency_logs.blade.php +++ b/resources/views/character/currency_logs.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/edit_profile.blade.php b/resources/views/character/edit_profile.blade.php index a63f5af508..0a50723fda 100644 --- a/resources/views/character/edit_profile.blade.php +++ b/resources/views/character/edit_profile.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/gallery.blade.php b/resources/views/character/gallery.blade.php index 4b1839f691..6690e58fcd 100644 --- a/resources/views/character/gallery.blade.php +++ b/resources/views/character/gallery.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php index 9ba9560a71..cefe6344fd 100644 --- a/resources/views/character/images.blade.php +++ b/resources/views/character/images.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/ownership_logs.blade.php b/resources/views/character/ownership_logs.blade.php index fb2c42fd72..1c691cfb1f 100644 --- a/resources/views/character/ownership_logs.blade.php +++ b/resources/views/character/ownership_logs.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/profile.blade.php b/resources/views/character/profile.blade.php index 0e7e9cf147..73666eb3ec 100644 --- a/resources/views/character/profile.blade.php +++ b/resources/views/character/profile.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/submission_logs.blade.php b/resources/views/character/submission_logs.blade.php index 06e9ee829b..04fe6b2342 100644 --- a/resources/views/character/submission_logs.blade.php +++ b/resources/views/character/submission_logs.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/transfer.blade.php b/resources/views/character/transfer.blade.php index df4bf0f22a..4d527a6574 100644 --- a/resources/views/character/transfer.blade.php +++ b/resources/views/character/transfer.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/character/update_form.blade.php b/resources/views/character/update_form.blade.php index 7e70c87b35..8ec6f58da6 100644 --- a/resources/views/character/update_form.blade.php +++ b/resources/views/character/update_form.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta-img') - {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }} + {{ $character->image->content_warnings ? asset('images/content-warning.png') : $character->image->thumbnailUrl }} @endsection @section('profile-content') diff --git a/resources/views/user/_profile_content.blade.php b/resources/views/user/_profile_content.blade.php index 16f6267946..9bc2a518ca 100644 --- a/resources/views/user/_profile_content.blade.php +++ b/resources/views/user/_profile_content.blade.php @@ -130,7 +130,7 @@
@if ((Auth::check() && Auth::user()->settings->content_warning_visibility == 0 && isset($character->character_warning)) || (isset($character->character_warning) && !Auth::check())) - Content Warning - {{ $character->fullName }} + Content Warning - {{ $character->fullName }} @else {{ $character->fullName }} @endif diff --git a/resources/views/widgets/_gallery_thumb.blade.php b/resources/views/widgets/_gallery_thumb.blade.php index 9b291400a3..efe72a76a4 100644 --- a/resources/views/widgets/_gallery_thumb.blade.php +++ b/resources/views/widgets/_gallery_thumb.blade.php @@ -1,5 +1,5 @@ @if (isset($submission->content_warning)) - Content Warning + Content Warning @elseif(isset($submission->hash)) Submission thumbnail @else